DESCRIPTION

Add javadoc and remove unused stuff.

Change-Id: I858255a8dfa8683365d0e6d709fda7e5eecd80e2


COMMENTS

author: Kamila Nguyen
date: 2012-08-23 19:02:52.000000000

Patch Set 1: Verified; Looks good to me, approved; IP review completed

Looks good to me :)

-------------------------------------
author: Kamila Nguyen
date: 2012-08-23 19:02:52.000000000

Change has been successfully cherry-picked

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