merge in lmp-release history after reset to af55a405c3838bbc6ea64de521e66eab57547f22
The Android Automerger [Tue, 9 Sep 2014 13:13:09 +0000 (06:13 -0700)]

Trivial merge