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