merge in lmp-release history after reset to f10eb56b5d2e783453205038d26fef4c9e9ef1d2
The Android Automerger [Mon, 1 Sep 2014 14:56:44 +0000 (07:56 -0700)]

Trivial merge