merge in lmp-mr1-release history after reset to 793fc0e13d

This commit is contained in:
The Android Automerger 2014-11-01 06:11:11 -07:00
commit ff6e40f889

Diff Content Not Available