merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Mon, 22 Dec 2014 14:10:32 +0000 (06:10 -0800)
committerThe Android Automerger <android-build@google.com>
Mon, 22 Dec 2014 14:10:32 +0000 (06:10 -0800)
commit680cebfd38150705dadaf92bc3b60f2f5c9e6edd
tree54dc5dc18788ec1b8446681a871c381e3bb46402
parenta6cae36b881e26fa288a83c94b8c357fd436140e
parent6e9a485964905eb464791475fdb63bbaef166a3a
merge in lmp-mr1-release history after reset to lmp-mr1-dev