| commit | 780837bd784c7d8876aaae9fc18d9b9382cfc1be | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 27 20:35:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:35:11 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 7425f17196e213390f54186ebc4ec7d7182d6c39 [diff] | |
| parent | 582084353ae930e8e328c00bb0be42d118e47afb [diff] |
am 58208435: am 7cb87ed1: (-s ours) am 71d4527d: am f81667bc: am 228c3de3: am ccc02053: am ef2c6e04: am 45e493e4: Merge "Merge commit \'5a289b87\' into HEAD" into lmp-dev * commit '582084353ae930e8e328c00bb0be42d118e47afb':