DESCRIPTION

Removing redundant declarations and making more fields final.

Change-Id: I9f2dcb6e37544c237d11e6f4050fe1120344aecb


COMMENTS

author: Natasha Sullivan
date: 2013-10-24 09:13:32.598000000

Uploaded patch set 2.

-------------------------------------
author: Natasha Sullivan
date: 2013-10-24 09:14:07.147000000

Patch Set 2: Verified+1 Code-Review+2

Rebased and tested.

-------------------------------------
