tree e257b71f2b37be720ec7eb483135e97100e732f1
parent 9d3382d97a2cdc8c8f78c7825ece16f09292fc36
parent b8e430701e6b91d1f01014091b4b1fd72fd49d19
author The Android Automerger <android-build@google.com> 1415282996 -0800
committer The Android Automerger <android-build@google.com> 1415282996 -0800

merge in lmp-mr1-release history after reset to 9d3382d97a2cdc8c8f78c7825ece16f09292fc36