merge in lmp-release history after reset to d8e5e81343

This commit is contained in:
The Android Automerger 2014-07-26 06:09:48 -07:00
commit 8a6c934580

Diff Content Not Available