merge in lmp-release history after reset to 253c4720af

This commit is contained in:
The Android Automerger 2014-09-06 06:10:51 -07:00
commit bcb9058cec

Diff Content Not Available