merge in lmp-mr1-release history after reset to 131866e1a4

This commit is contained in:
The Android Automerger 2014-10-25 06:11:05 -07:00
commit af43237a4a

Diff Content Not Available