merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
authorThe Android Automerger <android-build@google.com>
Wed, 6 Aug 2014 13:09:42 +0000 (06:09 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 6 Aug 2014 13:09:42 +0000 (06:09 -0700)
commit03f58adcdcce7e10a6f8cd25b7269a4be7491290
tree3db215ab17b79517721f284396f6f231a68b506a
parent4ec0f6d29023b78e08ed6afb3a985c91495ae381
parent4562a0ad5cda0e4020e5873764cca7b187af3f48
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381