merge in lmp-mr1-release history after reset to 8a6bf4bced8a37c671411e0f6dfa997c479a5153
authorThe Android Automerger <android-build@google.com>
Sat, 18 Oct 2014 13:11:02 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 18 Oct 2014 13:11:02 +0000 (06:11 -0700)
commit5c4ff1509c15974b45855639c4699a8dfe82ef9d
tree8fd077e2cbf91b6ecc4a051183cf941c13cda0af
parent8a6bf4bced8a37c671411e0f6dfa997c479a5153
parentba471547f8441120a5614ac001e140330581a2cd
merge in lmp-mr1-release history after reset to 8a6bf4bced8a37c671411e0f6dfa997c479a5153