tree 36b9789dffff5fb1bcb43c97ce38c014350b9429
parent c8d7a9313bb9bf980a4f88cf1b4a6437b7b95797
parent f1b85fc1e059bf9cfce8af07929dd610f61a7a52
author The Android Automerger <android-build@google.com> 1418220673 -0800
committer The Android Automerger <android-build@google.com> 1418220673 -0800

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