merge in lmp-release history after reset to 536e4e87d6da73a1a511a43dfcf40a338c3735e5
The Android Automerger [Mon, 6 Oct 2014 13:14:10 +0000 (06:14 -0700)]

Trivial merge