merge in lmp-release history after reset to 2f92daf76a66d7d2fe6fb7b1a28fc1b5888a7b7c
The Android Automerger [Tue, 2 Sep 2014 13:12:16 +0000 (06:12 -0700)]

Trivial merge