merge in lmp-release history after reset to f17dec635141a16b68ab4980c118d49ec5ae11c0
The Android Automerger [Thu, 16 Oct 2014 13:13:09 +0000 (06:13 -0700)]

Trivial merge