merge in lmp-mr1-release history after reset to 5965614f5b813f2739722589f84cec69c572b0a2
The Android Automerger [Thu, 30 Oct 2014 13:11:23 +0000 (06:11 -0700)]

Trivial merge