merge in lmp-release history after reset to 3ddaa6ec08d417d2848775ad3b5b01b865a9c891
The Android Automerger [Tue, 23 Sep 2014 13:16:26 +0000 (06:16 -0700)]

Trivial merge