tree b8b0d4e037629eb1112212e3b9e673bc39244f1f
parent 2020564f21bb0216965f0f5c43c5c1c995785bab
parent f54d64fc8e6dfcd1ced72548dd8c24e054f4969d
author The Android Automerger <android-build@google.com> 1414847344 -0700
committer The Android Automerger <android-build@google.com> 1414847344 -0700

merge in lmp-mr1-release history after reset to 2020564f21bb0216965f0f5c43c5c1c995785bab