tree bc68a7299601005ccf2987d4992f19abf91902dd
parent 44fb719e5f0f5ee7dcf4b1eae703593f1043a169
parent c0bcde987e2ee359f97968dc8e131cad691acb05
author The Android Automerger <android-build@google.com> 1423663728 -0800
committer The Android Automerger <android-build@google.com> 1423663728 -0800

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