tree bbc2974c13b4d17087b298e0f33593ba585417cd
parent f0a2a8b2f8b652ed251d96deec6e1d59ce693839
parent f37376989badaf9f297a9d74a81df6b788d9ca97
author The Android Automerger <android-build@google.com> 1421331016 -0800
committer The Android Automerger <android-build@google.com> 1421331016 -0800

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