| commit | 582084353ae930e8e328c00bb0be42d118e47afb | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 27 05:22:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:22:41 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 6f34bd6546ad33bdc0314e5642b880d28ac33d85 [diff] | |
| parent | 7cb87ed191a8cb94c669c5b84e7e9b8a693444cb [diff] |
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 '7cb87ed191a8cb94c669c5b84e7e9b8a693444cb':