commit | 69d96662ea939077ed961b741f106a9304906784 | [log] [tgz] |
---|---|---|
author | Qiwen Zhao <zhao@google.com> | Mon Mar 23 22:28:03 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:28:03 2015 +0000 |
tree | 8339538e204f27ac9d701cda10bcaebb98edf49d | |
parent | ba6e25d4021ee382ea482c28c5d360b62442a03d [diff] | |
parent | 4cc5d6f5fb85c30d2574e7bc9177caa35698ba16 [diff] |
am 4cc5d6f5: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. * commit '4cc5d6f5fb85c30d2574e7bc9177caa35698ba16':