merge in lmp-release history after reset to bd06406dceb430cca32ae2aa195fbf37b10d58b0
The Android Automerger [Sat, 23 Aug 2014 13:11:21 +0000 (06:11 -0700)]

Trivial merge