merge in lmp-release history after reset to 2867afc3febbfbc466a78c445690208e5dbde22a
The Android Automerger [Sun, 21 Sep 2014 04:01:53 +0000 (21:01 -0700)]

Trivial merge