merge in lmp-release history after reset to 7460b6e0abad953fc8946296fa3f11bc4b1b60c6
The Android Automerger [Mon, 20 Oct 2014 00:15:16 +0000 (17:15 -0700)]

Trivial merge