merge in lmp-release history after reset to e229678c0502930303de5dfdb939c0214a67d151
The Android Automerger [Sun, 24 Aug 2014 13:10:21 +0000 (06:10 -0700)]

Trivial merge