merge in lmp-release history after reset to bd59c0c43854cc0eb70f538dc740f9ecd138834f
The Android Automerger [Sat, 6 Sep 2014 15:51:49 +0000 (08:51 -0700)]

Trivial merge