tree e7739ae52375eba12c5d4706151692c1e16e9d95
parent 0b470dd9758d09d8adefc10a55b2ad3bc8fc022d
parent 7aaea57a26eb27955149d7bd3a6ed237e954a05d
author The Android Automerger <android-build@google.com> 1412860297 -0700
committer The Android Automerger <android-build@google.com> 1412860297 -0700

merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2ad3bc8fc022d