merge in lmp-release history after reset to 290c22f37406de9957f9168baaa3642aaf957924
The Android Automerger [Wed, 3 Sep 2014 13:12:17 +0000 (06:12 -0700)]

Trivial merge