tree b394eaf80ca4471637f4f800c994b83c678fafc0
parent 338356d75562d043b80bbc9b1c8c545ab2bc656d
parent f97f5bf53d2d70285abb4f8afabfaec204830b63
author The Android Automerger <android-build@google.com> 1418134232 -0800
committer The Android Automerger <android-build@google.com> 1418134232 -0800

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