merge in lmp-release history after reset to c93ffd4aff9e9b90210c6f1c9ae2a650f16f9edb
The Android Automerger [Thu, 9 Oct 2014 13:11:57 +0000 (06:11 -0700)]

Trivial merge