tree bbbeaafd4d59ff43ed32a8ef0817e459cc9c60c5
parent 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25
parent a1edecdec5606f89121b7997c31b16ef6eb0feaf
author The Android Automerger <android-build@google.com> 1415110395 -0800
committer The Android Automerger <android-build@google.com> 1415110395 -0800

merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25