| commit | 1cf21ab304cedf668e467395daa12bc10afe7f25 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Tue Sep 22 20:22:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:22:44 2015 +0000 |
| tree | 98509ed57ed5de37df6e0e64ba266e75c156c743 | |
| parent | 4fca7a546250662d132c863c09923cfad7359c38 [diff] | |
| parent | 492536cdac5a35585aac849fa4660bf61ecbd1d6 [diff] |
am 492536cd: (-s ours) am 3dad896f: (-s ours) am ff397e62: (-s ours) am cc40c023: (-s ours) am 91fe8072: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev * commit '492536cdac5a35585aac849fa4660bf61ecbd1d6': DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches