| commit | 133d4e6e22c778ca2729fe9f41bb218f0ee6a060 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Thu Oct 10 08:30:48 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 08:30:48 2013 -0700 |
| tree | 50705ace8779dc88d4e32494aec0bc763193a308 | |
| parent | 731c628f1d0d88d545bf32655e467f88c7ff9910 [diff] | |
| parent | 2cf4cee7edd1c00e0ba067bcda41c66d56c27883 [diff] |
am 2cf4cee7: am 3accabfc: am 0f0cd69a: am 3944a67c: am 6ec0cf12: Merge "Tentatively revert assets" * commit '2cf4cee7edd1c00e0ba067bcda41c66d56c27883':