tree e93b482d6cc561b786abd14c2733c0ababdc97b3
parent c78ebe373ef259452ee3dd30cfa2a08eb0852419
parent f5200d0b3729446e03b3ffc0036ca55e91468a3d
author The Android Automerger <android-build@google.com> 1422281330 -0800
committer The Android Automerger <android-build@google.com> 1422281330 -0800

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