merge in lmp-release history after reset to c3b06ddeb751a8fe0be6a5f17510853d4eb79d4d
The Android Automerger [Mon, 13 Oct 2014 13:12:04 +0000 (06:12 -0700)]

Trivial merge