merge in lmp-release history after reset to 5b4aa98b59f51ce8eea2c4e39a2bd1c188ac3e26
The Android Automerger [Mon, 18 Aug 2014 13:10:39 +0000 (06:10 -0700)]

Trivial merge