tree c4b160afe7b9e1518825d730cbadc4a233393a9a
parent 771d6966862127d707237eca7ac78a1230063223
parent d2ca51ac0c0727ae924259918ac6f25b3f8ce571
author Mindy Pereira <mindyp@google.com> 1330988005 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330988006 -0800

Merge "Small cleanup."