tree 96889969cc5c6996f293d5b99a57dd90e2f99bc8
parent e730717f2ed5402f591cf695bed3c141b7679517
parent 3a6fe5e071431ad600a17f33cec5027a352a1731
author The Android Automerger <android-build@google.com> 1415456089 -0800
committer The Android Automerger <android-build@google.com> 1415456089 -0800

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