merge in lmp-release history after reset to a2f4777cd46305eca48f38dc932696447a8ca4f6
The Android Automerger [Mon, 29 Sep 2014 13:18:41 +0000 (06:18 -0700)]

Trivial merge