| commit | 6a16756da4d793f5de6f71b75ced79fc6c27ae04 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Sun Mar 22 00:40:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Mar 22 00:40:38 2015 +0000 |
| tree | e79a52c0f293b00977926fbf4680665064b30ac8 | |
| parent | ee89449bb63da458f5d2028b6a053461622b0472 [diff] | |
| parent | 70936efe38d456e827c11f9bbd98845677ae85a9 [diff] |
am 70936efe: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. * commit '70936efe38d456e827c11f9bbd98845677ae85a9':