tree 9d370721069db60037cbeb1b306e9769a1615265
parent 9e042b547ac61eb259f28f49ca2d92a1629b9abc
parent 377b9e459f2ef0faa536c29c4d9115a2eb0abe1d
author The Android Automerger <android-build@google.com> 1415283077 -0800
committer The Android Automerger <android-build@google.com> 1415283077 -0800

merge in lmp-mr1-release history after reset to 9e042b547ac61eb259f28f49ca2d92a1629b9abc