merge in lmp-release history after reset to cbb9298b084b89d794eca0aae4e6997076e68284
The Android Automerger [Mon, 20 Oct 2014 00:11:58 +0000 (17:11 -0700)]

Trivial merge