tree daa5745bde677dd29242cacb4a417f9945f239ac
parent 6ada3294f99bf53c4cf206cee4d763979e354b18
parent 6d8b4c280f6118003ba4dfce36a5d08665e5c489
author The Android Automerger <android-build@google.com> 1421244654 -0800
committer The Android Automerger <android-build@google.com> 1421244654 -0800

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