tree a0dc8657948c8d01fd018ad0006ab724a4a12275
parent 374c358dd201583771b7aa391c56618548f543a6
parent 2b00910ded8aed0aba31b01c538c0b09ee64aa9a
author The Android Automerger <android-build@google.com> 1420639811 -0800
committer The Android Automerger <android-build@google.com> 1420639811 -0800

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