merge in lmp-release history after reset to 3ddaa6ec08d417d2848775ad3b5b01b865a9c891
The Android Automerger [Mon, 22 Sep 2014 13:13:44 +0000 (06:13 -0700)]

Trivial merge