merge in lmp-release history after reset to lmp-dev
The Android Automerger [Thu, 2 Oct 2014 12:27:22 +0000 (05:27 -0700)]

Trivial merge