tree aa33557fc68e0363baba4fd2b3c472d2a309cc00
parent c05314a0b230d6820e07bcc641e8a553b5196e86
parent 5553ed1e850c503477f9c286622462a1da1dda89
author The Android Automerger <android-build@google.com> 1415887824 -0800
committer The Android Automerger <android-build@google.com> 1415887824 -0800

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