merge in lmp-mr1-release history after reset to 8a6bf4bced8a37c671411e0f6dfa997c479a5153
authorThe Android Automerger <android-build@google.com>
Thu, 16 Oct 2014 13:12:18 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 16 Oct 2014 13:12:18 +0000 (06:12 -0700)
commitba471547f8441120a5614ac001e140330581a2cd
tree8fd077e2cbf91b6ecc4a051183cf941c13cda0af
parent8a6bf4bced8a37c671411e0f6dfa997c479a5153
parent2c323665e65929ebc1686703dbb3dddf3b6c30f1
merge in lmp-mr1-release history after reset to 8a6bf4bced8a37c671411e0f6dfa997c479a5153