merge in lmp-release history after reset to 7b960c8adc35113c6eb3fad6cdfe32c2169d380b
The Android Automerger [Wed, 15 Oct 2014 13:13:00 +0000 (06:13 -0700)]

Trivial merge