merge in lmp-release history after reset to 9ecf9dc231ad2720cb11d4b9aeb4fee620cd6e78
The Android Automerger [Wed, 22 Oct 2014 00:44:41 +0000 (17:44 -0700)]

Trivial merge