tree aba65bf01fb81dcaa8c3a7f0d9c1b2d53e92a8df
parent 335bc32bc7dae893358bde20557927e6ed6ad58c
parent 4c85f5bbdd05c891d8532f17d370cecec4c2ae96
author The Android Automerger <android-build@google.com> 1421676549 -0800
committer The Android Automerger <android-build@google.com> 1421676549 -0800

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