merge in lmp-mr1-release history after reset to 3f2b0aaa277545886571cbf90fc90fd5d304e714
The Android Automerger [Mon, 27 Oct 2014 13:10:27 +0000 (06:10 -0700)]

Trivial merge