merge in lmp-release history after reset to f0d5070a931327e6356d765478069b9e66452a5b
The Android Automerger [Tue, 26 Aug 2014 13:12:28 +0000 (06:12 -0700)]

Trivial merge