merge in lmp-release history after reset to 350074487acb6e5b75cf3149ebe815e060e60394
The Android Automerger [Mon, 20 Oct 2014 00:12:19 +0000 (17:12 -0700)]

Trivial merge