am 80e1b915: am acdd67bb: am 98da7cfc: am c2dda795: Tentatively revert inconsistent assets

* commit '80e1b915b95da33b3ae6f44f95d29ffeb406d0a1':
This commit is contained in:
Satoshi Kataoka 2013-10-09 22:40:34 -07:00 committed by Android Git Automerger
commit 157e561303

Diff content is not available