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

Trivial merge