merge in lmp-release history after reset to 3ddaa6ec08d417d2848775ad3b5b01b865a9c891
The Android Automerger [Mon, 20 Oct 2014 00:11:51 +0000 (17:11 -0700)]

Trivial merge