tree 83d56d5766fcdaded24935f3dc07b40b20299be9
parent 536e4e87d6da73a1a511a43dfcf40a338c3735e5
parent 6d4726a7cfb93aabb6714fb246c922014f603dca
author The Android Automerger <android-build@google.com> 1412514663 -0700
committer The Android Automerger <android-build@google.com> 1412514663 -0700

merge in lmp-mr1-release history after reset to 536e4e87d6da73a1a511a43dfcf40a338c3735e5