merge in lmp-release history after reset to f2e979267a6aeceec8c95283e65421a2f1a03608
The Android Automerger [Mon, 8 Sep 2014 13:14:13 +0000 (06:14 -0700)]

No differences found