merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
authorThe Android Automerger <android-build@google.com>
Mon, 11 Aug 2014 06:16:17 +0000 (06:16 +0000)
committerThe Android Automerger <android-build@google.com>
Mon, 11 Aug 2014 06:16:17 +0000 (06:16 +0000)

Trivial merge