tree a7b548fcf2e4a3733f76d566d3fbb9a73e376949
parent f3208df5982acf96831b8d34a4396807e3b1a107
parent 6afa112ffe3dc2cae12e172e4bfa694ec732d694
author The Android Automerger <android-build@google.com> 1415628491 -0800
committer The Android Automerger <android-build@google.com> 1415628491 -0800

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