merge in lmp-release history after reset to 24b998183845ea92deaa65a41720cbee61f474d4
The Android Automerger [Tue, 9 Sep 2014 13:13:21 +0000 (06:13 -0700)]

Trivial merge