tree 7b3a2aeab1ae2fc2ce74df87d7c8423b30362606
parent c343177bbac2f751b0e7708087924174034bf460
parent 8d4242c85d06fac67b46f0b9cb3462e0411e313c
author Przemyslaw Szczepaniak <pszczepaniak@google.com> 1455186218 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1455186219 +0000

Merge "SocketImpl#getFileDescriptor shouldn't be public" into nyc-dev