merge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Thu, 11 Dec 2014 14:13:05 +0000 (06:13 -0800)]

Trivial merge