merge in lmp-mr1-release history after reset to 5ee2c9d20c

This commit is contained in:
The Android Automerger 2014-10-02 06:14:43 -07:00
commit bcf2820b24

Diff Content Not Available