tree cb2ec2fb9a8c7ef0f2fb0eece064182a06cd01f6
parent db3ecf5488b7838078f951b236a6109e6c61ffba
parent 9d1ac76151817d3b7ad620742f28467c869a6b68
author Qiwen Zhao <zhao@google.com> 1426911819 -0700
committer Qiwen Zhao <zhao@google.com> 1426911819 -0700

reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.