tree f0e1d5275caf3ebd098a825399eff4964e3c421c
parent 7a28ce5ae3b261a6db50ed3e5bf4f58165ce4be6
parent 02d3d0abd2286d7b7a52f883fefa1e4436204134
author The Android Automerger <android-build@google.com> 1415456116 -0800
committer The Android Automerger <android-build@google.com> 1415456116 -0800

merge in lmp-mr1-release history after reset to 7a28ce5ae3b261a6db50ed3e5bf4f58165ce4be6