merge in lmp-release history after reset to d8e5e81343

This commit is contained in:
The Android Automerger 2014-07-27 06:08:44 -07:00
commit eca8c78a16

Diff Content Not Available