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

No differences found