merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
authorThe Android Automerger <android-build@google.com>
Thu, 14 Aug 2014 13:12:15 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 14 Aug 2014 13:12:15 +0000 (06:12 -0700)
commit39535d311e1f0b340e9d42583120daf68f0aa9db
tree3db215ab17b79517721f284396f6f231a68b506a
parent4ec0f6d29023b78e08ed6afb3a985c91495ae381
parent9bcae59358719ccaf32bbb8be9b7b7e2cbafd9ce
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381