tree 085b5e77f604d4c734b40893c62c24d309185760
parent 3ef05b7da4ecd6565b6b00797af9fb4f45eaa926
parent 293b06cb286fdd1b283dd70e80985632f8f9053f
author The Android Automerger <android-build@google.com> 1422972630 -0800
committer The Android Automerger <android-build@google.com> 1422972630 -0800

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