tree cd7995c6f5f8e0447c83873d180f89df9833d54a
parent 2eb4ec0e72fdfbea237feffc609c8d9ae5b3e26e
parent 3120b33204fc48a6375aed3ab26831aa7f17bb02
author Adam Vartanian <flooey@google.com> 1497341608 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497341614 +0000

Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev