tree dc06280df1287c900297bdc7f3b7bbe7a5100e07
parent c39da5640fdb2799b70d9ddcd3236aaf7b802cb9
parent 59faea1c2dabd68938067b5d1b11601cfdfe6d03
author The Android Automerger <android-build@google.com> 1415282952 -0800
committer The Android Automerger <android-build@google.com> 1415282952 -0800

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