Android CTS 7.0 Release 31 (5450832)
Merge "When we switched to BSD netcat, no one updated the license."