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