tree a2b682914fee9619b06ee52c68be25d1eaa7a1d3
parent 70f6dea9d06876bc65181c40ee9e623be196fb4c
parent c5a4b317264217964f154afe0b3c45b5aa3d6f65
author The Android Automerger <android-build@google.com> 1421676648 -0800
committer The Android Automerger <android-build@google.com> 1421676648 -0800

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