merge in lmp-release history after reset to 082cb621b1dd1ad150a747d5010fed0888ae416c
The Android Automerger [Wed, 6 Aug 2014 13:09:37 +0000 (06:09 -0700)]

Trivial merge