merge in lmp-mr1-release history after reset to 345fbb2613e3a1985108dc2c42ceabe2711243a6
authorThe Android Automerger <android-build@google.com>
Thu, 23 Oct 2014 13:12:16 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 23 Oct 2014 13:12:16 +0000 (06:12 -0700)
commit695343a647f8cc79d87bb9e25c2b18c553537a7e
tree79bf8e94def610e95fd8b8a4876bb1e470fcf175
parent345fbb2613e3a1985108dc2c42ceabe2711243a6
parent05e58282a1ff450f96203c4951c30704aa74fb87
merge in lmp-mr1-release history after reset to 345fbb2613e3a1985108dc2c42ceabe2711243a6