merge in lmp-release history after reset to c3b06ddeb751a8fe0be6a5f17510853d4eb79d4d
The Android Automerger [Tue, 14 Oct 2014 13:12:28 +0000 (06:12 -0700)]

No differences found