merge in lmp-release history after reset to 5bbf73ced3

This commit is contained in:
The Android Automerger 2014-09-18 06:12:20 -07:00
commit dcb16082dd

Diff Content Not Available