merge in lmp-release history after reset to 283b98ea941fdfc11d952b4da94ea105f0614bdf
The Android Automerger [Sun, 28 Sep 2014 13:14:08 +0000 (06:14 -0700)]

Trivial merge