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

Trivial merge