merge in lmp-release history after reset to 2f92daf76a66d7d2fe6fb7b1a28fc1b5888a7b7c
The Android Automerger [Wed, 27 Aug 2014 13:12:32 +0000 (06:12 -0700)]

Trivial merge