tree 8d70ed14773f27a40b58a7eead544b2669b9c9fc
parent 7441207fc100925e0b2cb6f5d271acfe2a92fd4a
parent f1babd8ca813ee1b003a1389ff85e813b1298622
author Qiwen Zhao <zhao@google.com> 1426984735 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426984735 +0000

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

* commit 'f1babd8ca813ee1b003a1389ff85e813b1298622':