merge in lmp-release history after reset to e818d6a43cbe831ea4e0274670f748a04b600ae8
The Android Automerger [Mon, 29 Sep 2014 13:18:25 +0000 (06:18 -0700)]

Trivial merge