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

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