OSDN Git Service

Merge "SocketImpl#getFileDescriptor shouldn't be public" into nyc-dev
authorPrzemyslaw Szczepaniak <pszczepaniak@google.com>
Thu, 11 Feb 2016 10:23:38 +0000 (10:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Feb 2016 10:23:39 +0000 (10:23 +0000)
1  2 
api/current.txt
api/system-current.txt
api/test-current.txt

diff --cc api/current.txt
Simple merge
Simple merge
Simple merge