merge in lmp-release history after reset to 2f92daf76a66d7d2fe6fb7b1a28fc1b5888a7b7c
The Android Automerger [Sun, 31 Aug 2014 16:32:30 +0000 (09:32 -0700)]

Trivial merge