tree b38f377bbb277045c1acf9dd4bce401dfe4a040e
parent 0c9384d512cab94b761dcb82325e4411cbaf52c0
parent f9f468b874eec59c272957a816ebccbea7ad46d3
author The Android Automerger <android-build@google.com> 1422540520 -0800
committer The Android Automerger <android-build@google.com> 1422540520 -0800

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