merge in lmp-release history after reset to 5b4aa98b59f51ce8eea2c4e39a2bd1c188ac3e26
The Android Automerger [Sun, 17 Aug 2014 14:18:30 +0000 (07:18 -0700)]

Trivial merge