merge in lmp-release history after reset to 7460b6e0abad953fc8946296fa3f11bc4b1b60c6 rel-22r2-golden-fostermp-partner rel-st8-l-r1-partner rel-st8-l-r2-partner rel-st8-l-r3-partner daily-2014.11.26.0_rel-st8-l-r1-partner daily-2014.11.28.0_rel-st8-l-r1-partner
The Android Automerger [Wed, 22 Oct 2014 00:46:14 +0000 (17:46 -0700)]

Trivial merge