merge in lmp-release history after reset to c187e073823cc4d9c86b536617ea0d198d14755e
The Android Automerger [Wed, 1 Oct 2014 13:18:21 +0000 (06:18 -0700)]

Trivial merge