| commit | d5d8a0b5d5e70ec48a694408455cebc10efd0a08 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Tue Sep 22 21:06:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:06:08 2015 +0000 |
| tree | d4d4a0d2c3b83b1a2b958f971208bb87772c72b8 | |
| parent | dec9937e560cf4eec0a9f7edc85c0d38cf4964ee [diff] | |
| parent | 39c1152a07617f1f1eef86293457aaf6348bc91d [diff] |
am 39c1152a: (-s ours) am 0369452a: (-s ours) am bd623e0a: (-s ours) am 1cf21ab3: (-s ours) 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" int * commit '39c1152a07617f1f1eef86293457aaf6348bc91d': DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches