tree a8adce02e664ba213f06709f188e19e6d4ef2d96
parent a2f4777cd46305eca48f38dc932696447a8ca4f6
parent 3bfb19141da462c20a80757d3a579341881881fe
author The Android Automerger <android-build@google.com> 1412083138 -0700
committer The Android Automerger <android-build@google.com> 1412083138 -0700

merge in lmp-release history after reset to a2f4777cd46305eca48f38dc932696447a8ca4f6