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

Trivial merge