merge in lmp-release history after reset to 8eb4b07b8535c04901cc46dc7860c87aa9e9fbfc
The Android Automerger [Tue, 14 Oct 2014 13:12:18 +0000 (06:12 -0700)]

Trivial merge