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

No differences found