tree 820999bfaf641b43ac8d1118b702e406a6c778b7
parent 0c11f31b610534754f48b40d0a6ccdd311d43fcf
parent 60d2954301cb06eeeddf7f8e101bec4b4ff47ca8
author The Android Automerger <android-build@google.com> 1423577428 -0800
committer The Android Automerger <android-build@google.com> 1423577428 -0800

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