merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Wed, 10 Dec 2014 14:11:09 +0000 (06:11 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 10 Dec 2014 14:11:09 +0000 (06:11 -0800)
commit5ec042e6a1b075a69c741427be3f30556449f25d
tree107fdc9c1fd7d61d2953d9f51a9cc87cdc744a5b
parent3fd20025b87ff6828182d21668dd0b7a4a0435ec
parent17419d98813fe4ce210268728cb09f2013b19cbf
merge in lmp-mr1-release history after reset to lmp-mr1-dev