merge in lmp-release history after reset to af55a405c3838bbc6ea64de521e66eab57547f22
The Android Automerger [Sat, 6 Sep 2014 13:10:53 +0000 (06:10 -0700)]

Trivial merge