merge in lmp-release history after reset to e229678c0502930303de5dfdb939c0214a67d151
The Android Automerger [Mon, 25 Aug 2014 13:12:24 +0000 (06:12 -0700)]

Trivial merge