merge in lmp-release history after reset to 60cf53ddd088ab8ee57d25ae7051bfc2ec8fd71c
The Android Automerger [Wed, 10 Sep 2014 13:11:57 +0000 (06:11 -0700)]

Trivial merge