tree 26bf339df6f2ae7d7702b96f42f697424fa5b652
parent 95cd2d4ab35983e20601e40637bcf36971cd2b4f
parent 7f1c6b2dc21682a46bbd3d2019a724f7b531f715
author The Android Automerger <android-build@google.com> 1422540489 -0800
committer The Android Automerger <android-build@google.com> 1422540489 -0800

merge in lmp-mr1-release history after reset to lmp-mr1-dev