merge in lmp-release history after reset to f7020726f9fe1406f288064185235b7758f301ad
The Android Automerger [Sat, 13 Sep 2014 15:43:26 +0000 (08:43 -0700)]

Trivial merge