tree eadbbdedac4cd319166950037e165d3169adb502
parent 55157d27305d06569f0bd7d3c47ec51855f87da4
parent de0b0c3c78c0d8f84d1b7ab5ccb019c71d2b0ac6
author The Android Automerger <android-build@google.com> 1413465162 -0700
committer The Android Automerger <android-build@google.com> 1413465162 -0700

merge in lmp-mr1-release history after reset to 55157d27305d06569f0bd7d3c47ec51855f87da4