merge in lmp-release history after reset to 3ddaa6ec08d417d2848775ad3b5b01b865a9c891
The Android Automerger [Sat, 20 Sep 2014 13:12:11 +0000 (06:12 -0700)]

Trivial merge