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

* commit '67c06fc2b85efe221a949ef0fbffa1280efc55ba':
main
Qiwen Zhao 2015-03-23 22:53:02 +00:00 committed by Android Git Automerger
commit 2f7c39d3b7

Diff Content Not Available