merge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Sun, 9 Nov 2014 16:05:02 +0000 (08:05 -0800)]

Trivial merge