| commit | ff397e627a3f9373e813cbfe3fdb9cd03aa4b0f8 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Tue Sep 22 18:25:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 18:25:18 2015 +0000 |
| tree | 0c08cc8d4bfcdd7cd832aed7ef6cc559ada86a5a | |
| parent | 379468d33a9a39a3cad6637197c55aac83bc482d [diff] | |
| parent | cc40c02304de8462925c33f0aa36b8240b252d9c [diff] |
am cc40c023: (-s ours) am 91fe8072: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev * commit 'cc40c02304de8462925c33f0aa36b8240b252d9c': DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches