merge in lmp-mr1-release history after reset to 71382693cbc81b1d131085f52d97879976706f55
The Android Automerger [Sun, 2 Nov 2014 14:10:51 +0000 (06:10 -0800)]

Trivial merge