tree b371f0c882b9d654dcc14cf13685686c547f3684
parent 6c349a1869389cd0c70aa9a15467477e616f46b9
parent cb6f26530ef61dab1ab0bc2d0b273fd128798526
author The Android Automerger <android-build@google.com> 1421676645 -0800
committer The Android Automerger <android-build@google.com> 1421676645 -0800

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