merge in lmp-release history after reset to 8eb4b07b8535c04901cc46dc7860c87aa9e9fbfc
The Android Automerger [Mon, 13 Oct 2014 13:11:53 +0000 (06:11 -0700)]

Trivial merge