merge in lmp-mr1-release history after reset to 31f19e6271e53f7fb359866bd32a8b6a3d47d115
The Android Automerger [Mon, 13 Oct 2014 13:11:18 +0000 (06:11 -0700)]

Trivial merge