merge in lmp-release history after reset to d98d019d2a23bc7a8f96e8388021e5c87b71f158
The Android Automerger [Mon, 6 Oct 2014 13:13:55 +0000 (06:13 -0700)]

Trivial merge