merge in lmp-release history after reset to 0ecd4dd5dd21f1f623a55f43db1b783aad82e5b6
The Android Automerger [Sat, 20 Sep 2014 13:12:23 +0000 (06:12 -0700)]

Trivial merge