merge in lmp-release history after reset to f2e979267a6aeceec8c95283e65421a2f1a03608
The Android Automerger [Sat, 6 Sep 2014 13:11:00 +0000 (06:11 -0700)]

Trivial merge