merge in lmp-release history after reset to d8e5e81343

This commit is contained in:
The Android Automerger 2014-07-28 09:20:32 -07:00
commit e153a0ac3b

Diff Content Not Available