commit 42e3cdc2b33e93294d78d9b787526d5e46b35283
author Dmitry Shmidt <dimitrysh@google.com> Fri Jan 16 00:05:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 16 00:05:14 2015 +0000
tree d54a7815d2fb949d0bde6101756312989b486e3e
parent 8ecb69764721f4e1a4f47bb184f855cd70b3cfa2
parent 2901b30a58a6a7f708bb3e5df8b483cf8035c740

am 2901b30a: am 70f6dea9: Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev

* commit '2901b30a58a6a7f708bb3e5df8b483cf8035c740':
  android_filesystem: Remove setuid bits from tcpdump

include/private/android_filesystem_config.h

diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 5efe2e1..101cacd 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -252,7 +252,6 @@
     { 06755, AID_ROOT,      AID_ROOT,      0, "system/xbin/librank" },
     { 06755, AID_ROOT,      AID_ROOT,      0, "system/xbin/procrank" },
     { 06755, AID_ROOT,      AID_ROOT,      0, "system/xbin/procmem" },
-    { 06755, AID_ROOT,      AID_ROOT,      0, "system/xbin/tcpdump" },
     { 04770, AID_ROOT,      AID_RADIO,     0, "system/bin/pppd-ril" },
 
     /* the following files have enhanced capabilities and ARE included in user builds. */