am 40ed4430: am 87909f07: am de7d659e: am b2c21033: Merge "Small cleanup"

* commit '40ed443087f885a6a437081679af4c0aac7b8d4a':
This commit is contained in:
Tadashi G. Takaoka 2013-10-03 11:55:35 -07:00 committed by Android Git Automerger
commit caeaea71af

Diff content is not available