merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
authorThe Android Automerger <android-build@google.com>
Tue, 5 Aug 2014 13:09:31 +0000 (06:09 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 5 Aug 2014 13:09:31 +0000 (06:09 -0700)

Trivial merge