merge in lmp-release history after reset to 082cb621b1dd1ad150a747d5010fed0888ae416c
The Android Automerger [Thu, 7 Aug 2014 13:10:07 +0000 (06:10 -0700)]

Trivial merge