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

Trivial merge