tree c26ffb8c2679aaeb5cfcb283a726331708a65c4b
parent cb73599b25098b3513feda11ca5cb17d77fec83e
parent e27f7d954e2f5b367e0f06134a6a9fff298756d7
author The Android Automerger <android-build@google.com> 1422454118 -0800
committer The Android Automerger <android-build@google.com> 1422454118 -0800

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