merge in lmp-release history after reset to 9de6c7b167c9fd82afbf272b690225e963f5c951
The Android Automerger [Thu, 25 Sep 2014 13:18:58 +0000 (06:18 -0700)]

Trivial merge