merge in lmp-release history after reset to f10eb56b5d2e783453205038d26fef4c9e9ef1d2
The Android Automerger [Sun, 31 Aug 2014 16:32:43 +0000 (09:32 -0700)]

Trivial merge