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