tree c61e463b5d56e09f334ef6ab2430c51667b31c28
parent 59273ede02fc91d2a3297547d959159c8c6f69f3
parent 1e23c70c8bb59d8d55c18d971a4666984a4638d3
author The Android Automerger <android-build@google.com> 1418220735 -0800
committer The Android Automerger <android-build@google.com> 1418220735 -0800

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