tree ab74f904c7bfd2b482c46615c1f938fa23b8b0b9
parent 07ca51e41e0536fd23a3f5260ce0c34bfb02ffd4
parent cf838069b4389d7592e0469358e99f5f3d4c41eb
author Qiwen Zhao <zhao@google.com> 1426984839 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426984839 +0000

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

* commit 'cf838069b4389d7592e0469358e99f5f3d4c41eb':