merge in lmp-release history after reset to 350074487acb6e5b75cf3149ebe815e060e60394
The Android Automerger [Tue, 21 Oct 2014 13:13:03 +0000 (06:13 -0700)]

Trivial merge