merge in lmp-release history after reset to 536cae75031e11ee30da0a0b4d4a0752e5526e96
The Android Automerger [Wed, 8 Oct 2014 13:16:03 +0000 (06:16 -0700)]

Trivial merge