commit 87fd5810f7aa383e8f924e396596c1e523760777
author Elliott Hughes <enh@google.com> Thu Feb 25 16:20:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 25 16:20:58 2016 +0000
tree ae9c6193ee54b498ce1256fd24079e5a3dc6eb7a
parent 02fa7b88cc275c936b084d94fa02ba3169cfb1d4
parent 4a0f66749db4cd45a696352ab2f4dbaf23c1dee3

Merge "Swapped memset params"
am: 4a0f66749d

* commit '4a0f66749db4cd45a696352ab2f4dbaf23c1dee3':
  Swapped memset params

tests/cts/net/jni/NativeDnsJni.c

diff --git a/tests/cts/net/jni/NativeDnsJni.c b/tests/cts/net/jni/NativeDnsJni.c
index 4eb3c7a..352c0c5 100644
--- a/tests/cts/net/jni/NativeDnsJni.c
+++ b/tests/cts/net/jni/NativeDnsJni.c
@@ -126,7 +126,7 @@
         return JNI_FALSE;
     }
 
-    memset(buf, sizeof(buf), 0);
+    memset(buf, 0, sizeof(buf));
     res = getnameinfo((const struct sockaddr*)&sa6, sizeof(sa6), buf, sizeof(buf), NULL, 0, flags);
     if (res != 0) {
         ALOGD("getnameinfo(%s (GoogleDNS) ) gave error %d (%s)", GoogleDNSIpV6Address2,