| commit | 219fa3a18a0ff2ae5242a213193121157f8bb5a3 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Mon Mar 23 22:28:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:28:33 2015 +0000 |
| tree | 2f5c12fcabe54ee99316e0ab929369fcadfd5fc6 | |
| parent | e836b0f31783747970ae03758185983fbc7f8129 [diff] | |
| parent | e15b95539b7091412149f32a0c0c7283030f7dc9 [diff] |
am e15b9553: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. * commit 'e15b95539b7091412149f32a0c0c7283030f7dc9':