merge in lmp-mr1-release history after reset to 345fbb2613e3a1985108dc2c42ceabe2711243a6
authorThe Android Automerger <android-build@google.com>
Wed, 22 Oct 2014 13:10:42 +0000 (06:10 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 22 Oct 2014 13:10:42 +0000 (06:10 -0700)
commit05e58282a1ff450f96203c4951c30704aa74fb87
tree79bf8e94def610e95fd8b8a4876bb1e470fcf175
parent345fbb2613e3a1985108dc2c42ceabe2711243a6
parent63b6037a056fcec756953b1b2aadaecd088861db
merge in lmp-mr1-release history after reset to 345fbb2613e3a1985108dc2c42ceabe2711243a6