merge in lmp-mr1-release history after reset to 7b97351b68

This commit is contained in:
The Android Automerger 2014-10-30 06:11:21 -07:00
commit e47a752ac0

Diff Content Not Available