Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs....

author Adam Vartanian <flooey@google.com>

Tue, 13 Jun 2017 08:27:31 +0000 (08:27 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 13 Jun 2017 08:27:31 +0000 (08:27 +0000)
author Adam Vartanian <flooey@google.com>
Tue, 13 Jun 2017 08:27:31 +0000 (08:27 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 08:27:31 +0000 (08:27 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Adam Vartanian <flooey@google.com>
	Tue, 13 Jun 2017 08:27:31 +0000 (08:27 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 13 Jun 2017 08:27:31 +0000 (08:27 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history