OSDN Git Service

Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs....
authorAdam Vartanian <flooey@google.com>
Tue, 13 Jun 2017 08:27:31 +0000 (08:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 08:27:31 +0000 (08:27 +0000)
commit57a8d531304c3324525b0e365ae12875df54f6a6
tree8f2478486fb631d67d99c1846084cf23d28d9fdd
parent7ac7c16cd8d645e4c00742ffe0c9fdf77602a69c
parent0cbfb82f3865e40f16fba97f2c298b60eab4603f
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev am: 87587fbda2
am: 0cbfb82f38

Change-Id: I7c7876d9fe871178be0918f0c8c48218527a18e0
api/current.txt
api/system-current.txt
api/test-current.txt