tree fec81dbd00c5d184896bb4d0001746b62bb013d2
parent 2bdb5c84b88fe64a13ed5a17a5e482190c6cd9c9
parent 70c9329fa23941e1844e90ccb4341d899593810a
author The Android Automerger <android-build@google.com> 1415887988 -0800
committer The Android Automerger <android-build@google.com> 1415887988 -0800

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