Android CTS 8.0 Release 12 (4890494)
merge in oc-release history after reset to master
tree: ea158d57657957363fa039a4bf290651d039fc7a
  1. net/