tree 9af5d8cc6c2c64193cf650e755d95f3fdf381e3e
parent 7023f614e240687e433368a6bfe4116d8f1fedcf
parent 8708cdaf248e15c9e392bfca51ad831e85ea0a6f
author The Android Automerger <android-build@google.com> 1423145127 -0800
committer The Android Automerger <android-build@google.com> 1423145127 -0800

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