merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
authorThe Android Automerger <android-build@google.com>
Sun, 3 Aug 2014 13:09:03 +0000 (06:09 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 3 Aug 2014 13:09:03 +0000 (06:09 -0700)
commitc0f8b307755f53394fb7b4b71864fdf1b7105368
tree3db215ab17b79517721f284396f6f231a68b506a
parent4ec0f6d29023b78e08ed6afb3a985c91495ae381
parent96a75e40387f03ddeff85782e6ac1b8112a5d339
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381