merge in lmp-release history after reset to 48a3723b5dea5257aab2fffd542d23dcc8a0ffbb
The Android Automerger [Wed, 8 Oct 2014 13:16:29 +0000 (06:16 -0700)]

Trivial merge