merge in lmp-release history after reset to f10eb56b5d2e783453205038d26fef4c9e9ef1d2
The Android Automerger [Tue, 2 Sep 2014 13:12:26 +0000 (06:12 -0700)]

Trivial merge