merge in lmp-release history after reset to 1f55fe07ec11103d5da23ca83f7bad72d5cdd76a
The Android Automerger [Mon, 11 Aug 2014 06:16:11 +0000 (06:16 +0000)]

Trivial merge