merge in lmp-release history after reset to bd06406dceb430cca32ae2aa195fbf37b10d58b0
The Android Automerger [Mon, 25 Aug 2014 13:12:36 +0000 (06:12 -0700)]

Trivial merge