merge in lmp-release history after reset to 111eecc9845826e985c48133b754e453fb3aca84
The Android Automerger [Sat, 13 Sep 2014 13:13:33 +0000 (06:13 -0700)]

Trivial merge