merge in lmp-release history after reset to 7460b6e0abad953fc8946296fa3f11bc4b1b60c6
The Android Automerger [Tue, 21 Oct 2014 13:15:19 +0000 (06:15 -0700)]

Trivial merge