merge in lmp-release history after reset to 1f55fe07ec11103d5da23ca83f7bad72d5cdd76a
The Android Automerger [Sun, 17 Aug 2014 14:18:39 +0000 (07:18 -0700)]

Trivial merge