| commit | f9f5f56488cbd8742c3b1bbf6c36689eacdf01d6 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Sep 16 23:00:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 23:00:20 2014 +0000 |
| tree | 868b70fbd12194adb7aee427bf524bf2ab852ed2 | |
| parent | f1482579ed0b94afcc97a894d93816212c0240d5 [diff] | |
| parent | fb1bf84165375a29e5947e3f6f6345c57de1a7d1 [diff] |
am 880d88b3: Merge "Restore changes that were needed." into lmp-dev * commit '880d88b308c73a598578f39892a3f01c201d9314': Restore changes that were needed.