tree e79a52c0f293b00977926fbf4680665064b30ac8
parent ee89449bb63da458f5d2028b6a053461622b0472
parent 70936efe38d456e827c11f9bbd98845677ae85a9
author Qiwen Zhao <zhao@google.com> 1426984838 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426984838 +0000

am 70936efe: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.

* commit '70936efe38d456e827c11f9bbd98845677ae85a9':