| commit | b952da06c42cf32757c6f4fedaa3c4a8c664f913 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Thu Sep 17 21:00:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 21:00:31 2015 +0000 |
| tree | 485ce6ad5cee33d8efb70515a0bb7d66a874270f | |
| parent | d7d1ab0e3029ebcc1f4a75e6daf2c5e6fef3774f [diff] | |
| parent | 1fa9435ab98359cc2fbfa8d0d455e939e32eda0e [diff] |
am 1fa9435a: (-s ours) am 2dae2571: (-s ours) am b0f33fbd: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit on lmp-dev" into lmp-mr1-dev * commit '1fa9435ab98359cc2fbfa8d0d455e939e32eda0e': DO NOT MERGE ANYWHERE:revert and resubmit on lmp-dev