| commit | 5ed1de8d2c7ca26f93cc7f945bfdd10d00985fc1 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Sun Mar 22 00:39:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Mar 22 00:39:28 2015 +0000 |
| tree | 33a7da821dc26e0a226d53f34e95d7ec267032d9 | |
| parent | cbb72513fcb531e8fd4064fbe21fcdf5e99454de [diff] | |
| parent | 1fed60b26632ac9e9feadda282d5fb522d175691 [diff] |
am 1fed60b2: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. * commit '1fed60b26632ac9e9feadda282d5fb522d175691':