merge in lmp-release history after reset to 45b5f3131eb0fab88ab77e64aa7294742aab3478
The Android Automerger [Thu, 21 Aug 2014 13:12:21 +0000 (06:12 -0700)]

Trivial merge