merge in lmp-release history after reset to ac2f065ee7fd1eb4ee1be4165eb50011f4025bd4
The Android Automerger [Thu, 4 Sep 2014 13:12:50 +0000 (06:12 -0700)]

Trivial merge