merge in lmp-release history after reset to 97596520ebcb4bb89d2901bd401afad45a306a38
The Android Automerger [Wed, 17 Sep 2014 13:13:26 +0000 (06:13 -0700)]

Trivial merge