merge in lmp-release history after reset to 2f92daf76a66d7d2fe6fb7b1a28fc1b5888a7b7c
The Android Automerger [Mon, 1 Sep 2014 14:56:35 +0000 (07:56 -0700)]

Trivial merge