tree bf064c0be604157b8e5717a822e0ce3c04c4397f
parent 01f9450ba2c4330b6846f8cd48c0f54c122d574d
parent 5ad433bd9b8a08eec537068704781243b1e80536
author The Android Automerger <android-build@google.com> 1422281345 -0800
committer The Android Automerger <android-build@google.com> 1422281345 -0800

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