commit | 02923c49ecccaed93eae98f80beaf255f415e245 | [log] [tgz] |
---|---|---|
author | Qiwen Zhao <zhao@google.com> | Sun Mar 22 00:38:55 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Mar 22 00:38:55 2015 +0000 |
tree | 8d70ed14773f27a40b58a7eead544b2669b9c9fc | |
parent | 7441207fc100925e0b2cb6f5d271acfe2a92fd4a [diff] | |
parent | f1babd8ca813ee1b003a1389ff85e813b1298622 [diff] |
am f1babd8c: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. * commit 'f1babd8ca813ee1b003a1389ff85e813b1298622':