merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Tue, 23 Dec 2014 14:09:29 +0000 (06:09 -0800)
committerThe Android Automerger <android-build@google.com>
Tue, 23 Dec 2014 14:09:29 +0000 (06:09 -0800)
commitac1dcd9e4cc3ab39fb1f0bd432a918c953174479
treeaf093e77161b7d31699d93b0f9baa911116b88e1
parent82f7812ac0250a2c61ce2fd9b7439cdf841ef893
parent680cebfd38150705dadaf92bc3b60f2f5c9e6edd
merge in lmp-mr1-release history after reset to lmp-mr1-dev