merge in lmp-release history after reset to 017b930634e4a0c03e927e4ebcc09252d8ee7c76
The Android Automerger [Sat, 13 Sep 2014 15:43:33 +0000 (08:43 -0700)]

Trivial merge