commit 67f2efd21f2e426f2e9d223849b17f849c9d91fa
author The Android Automerger <android-build@android.com> Thu Feb 28 05:56:14 2013 -0800
committer The Android Automerger <android-build@android.com> Thu Feb 28 05:56:14 2013 -0800
tree b8b347c1259c7e3dde3f84ed4eeef9c81fa7800e
parent 4c609e9683959193dafd7a32bb8393410cbddc74
parent 4eb8edcec71d0cecbe3b1646202c0df9e8d6ca9d

merge in jb-mr2-release history after reset to jb-mr2-dev

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index 530a4c8..a11e024 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -1195,8 +1195,7 @@
 #endif
     int i;
     for (i = 0; prctl(PR_CAPBSET_READ, i, 0, 0, 0) >= 0; i++) {
-        if ((i == CAP_NET_RAW) || (i == CAP_SETUID) || (i == CAP_SETGID)) {
-            // CAP_NET_RAW needed by /system/bin/ping
+        if ((i == CAP_SETUID) || (i == CAP_SETGID)) {
             // CAP_SETUID CAP_SETGID needed by /system/bin/run-as
             continue;
         }