tree dc59097964552399310692bd5c2439157ee4bf30
parent 7bcab2da1afebf3eda3fb96402c507c0fea7f627
parent b14fbb428f64da0d224a9d95b5a89fe5a5c0b794
author The Android Automerger <android-build@google.com> 1418307261 -0800
committer The Android Automerger <android-build@google.com> 1418307261 -0800

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