tree bbbeaafd4d59ff43ed32a8ef0817e459cc9c60c5
parent 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25
parent 32ce92dce04aad04714c5e7811d7b0e76681f3c8
author The Android Automerger <android-build@google.com> 1414415451 -0700
committer The Android Automerger <android-build@google.com> 1414415451 -0700

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