merge in lmp-release history after reset to 789ea039b33d82205cfff31702e7194f4227a7bc
The Android Automerger [Wed, 27 Aug 2014 13:12:47 +0000 (06:12 -0700)]

Trivial merge