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

Trivial merge