merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
authorThe Android Automerger <android-build@google.com>
Sun, 17 Aug 2014 14:18:53 +0000 (07:18 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 17 Aug 2014 14:18:53 +0000 (07:18 -0700)

Trivial merge