| commit | d0f6d79c2f0d5911146d4c70e4732af866bb8098 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Mon Mar 23 22:27:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:27:52 2015 +0000 |
| tree | 4d7a79f9f5fce0c835663ed216993f9f545f644b | |
| parent | d1f5cb46c563fe236aa9144a0a0c546dce518ef6 [diff] | |
| parent | eb5e612bceedf2d9fe35d35edb1c4207f404c376 [diff] |
am eb5e612b: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. * commit 'eb5e612bceedf2d9fe35d35edb1c4207f404c376':