tree 9af5d8cc6c2c64193cf650e755d95f3fdf381e3e
parent 7245b4e2bed6cef8c6bf4cc67ffd98989fde3c91
parent 798c65e151221f411ac215cf31a23cae8fcb1646
author The Android Automerger <android-build@google.com> 1422886124 -0800
committer The Android Automerger <android-build@google.com> 1422886124 -0800

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