merge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Mon, 22 Dec 2014 14:10:32 +0000 (06:10 -0800)]

Trivial merge