merge in lmp-mr1-release history after reset to ea2b5836f86a9fda6730e680f063370b9e3a1ef9
The Android Automerger [Tue, 28 Oct 2014 13:14:00 +0000 (06:14 -0700)]

Trivial merge