merge in lmp-release history after reset to cbb9298b084b89d794eca0aae4e6997076e68284
The Android Automerger [Tue, 21 Oct 2014 13:12:52 +0000 (06:12 -0700)]

Trivial merge