summaryrefslogtreecommitdiffstats
path: root/luni/src/main/java/android/system/Os.java
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-03-16 11:12:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-16 11:12:58 +0000
commit2b4ae2748dda20a34ccb8143f66c19d4162551bf (patch)
treea2f68e38632c89583eaa7c4e81cb3b7e84584483 /luni/src/main/java/android/system/Os.java
parent2a28c71f445ae29d801f0519675512789f91fa51 (diff)
parent29e698e33247219311a98756833439a7a4f1e71a (diff)
downloadlibcore-2b4ae2748dda20a34ccb8143f66c19d4162551bf.zip
libcore-2b4ae2748dda20a34ccb8143f66c19d4162551bf.tar.gz
libcore-2b4ae2748dda20a34ccb8143f66c19d4162551bf.tar.bz2
am 29e698e3: am 71f07546: Merge "Also support IPv4 fallback in the SocketAddress version of sendto."
* commit '29e698e33247219311a98756833439a7a4f1e71a': Also support IPv4 fallback in the SocketAddress version of sendto.
Diffstat (limited to 'luni/src/main/java/android/system/Os.java')
0 files changed, 0 insertions, 0 deletions