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

Trivial merge