tree b15d5dd946ad5ff5441b2f2939d7b5c191fdc83e
parent 00e1370e13e4e46c07d236ce54150af4299281ae
parent f31a1138d16bb7677030828c734993fadd831e84
author The Android Automerger <android-build@google.com> 1418134096 -0800
committer The Android Automerger <android-build@google.com> 1418134096 -0800

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