| commit | 6e85aada76f08aa320419b90d5d4f8932a0ec79c | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Sep 16 23:14:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 23:14:46 2014 +0000 |
| tree | 5976fb80b17f63b5357798e629491d9e33068d08 | |
| parent | 6a3276e05a96403da2b1323fb239c14ada6ff61e [diff] | |
| parent | f9f5f56488cbd8742c3b1bbf6c36689eacdf01d6 [diff] |
am b23fec37: am 880d88b3: Merge "Restore changes that were needed." into lmp-dev * commit 'b23fec371a22975abfb5a2951b4cf05d4b7238f2': Restore changes that were needed.