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

Trivial merge