merge in lmp-release history after reset to 48a3723b5dea5257aab2fffd542d23dcc8a0ffbb
The Android Automerger [Thu, 9 Oct 2014 13:12:08 +0000 (06:12 -0700)]

Trivial merge