merge in lmp-release history after reset to 1f55fe07ec11103d5da23ca83f7bad72d5cdd76a
The Android Automerger [Tue, 12 Aug 2014 13:11:41 +0000 (06:11 -0700)]

Trivial merge