tree 9b5cf08515ae8c2e8125931b438b3c2f175268bf
parent e2c3ff9a719f6e0cf0cc9683bc8031adaf5ef49c
parent c94d6d73eb7a339dc54576ed5daf04752bf343c9
author The Android Automerger <android-build@google.com> 1418134200 -0800
committer The Android Automerger <android-build@google.com> 1418134200 -0800

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