Gitiles
Code Review Sign In
review.blissroms.org / platform_system_netd / 4f931639b8d4fd92db16431d97e3fd18feb477f9
commit4f931639b8d4fd92db16431d97e3fd18feb477f9[log] [tgz]
authorJean-Baptiste Queru <jbq@google.com>Thu Jun 14 17:09:03 2012 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Thu Jun 14 17:09:03 2012 -0700
tree3cbdf3c567dd211cf436b8396a6e51a3d923f275
parent158e8f3613093fdf7b146cab89b08e8dc457a903 [diff]
parent9997f9a3edac2baac244c2fe8e49685a3be9f482 [diff]
am 9997f9a3: resolved conflicts for merge of e36a3a2f to jb-dev-plus-aosp

* commit '9997f9a3edac2baac244c2fe8e49685a3be9f482':
  Run dnsmasq with options --keep-in-foreground and --pid-file.
tree: 3cbdf3c567dd211cf436b8396a6e51a3d923f275
  1. Android.mk
  2. BandwidthController.cpp
  3. BandwidthController.h
  4. CleanSpec.mk
  5. CommandListener.cpp
  6. CommandListener.h
  7. DnsProxyListener.cpp
  8. DnsProxyListener.h
  9. IdletimerController.cpp
  10. IdletimerController.h
  11. List.h
  12. logwrapper.c
  13. main.cpp
  14. MDnsSdListener.cpp
  15. MDnsSdListener.h
  16. NatController.cpp
  17. NatController.h
  18. ndc.c
  19. NetdCommand.cpp
  20. NetdCommand.h
  21. NetdConstants.cpp
  22. NetdConstants.h
  23. NetlinkHandler.cpp
  24. NetlinkHandler.h
  25. NetlinkManager.cpp
  26. NetlinkManager.h
  27. oem_iptables_hook.cpp
  28. oem_iptables_hook.h
  29. PanController.cpp
  30. PanController.h
  31. PppController.cpp
  32. PppController.h
  33. ResolverController.cpp
  34. ResolverController.h
  35. ResponseCode.h
  36. SecondaryTableController.cpp
  37. SecondaryTableController.h
  38. SoftapController.cpp
  39. SoftapController.h
  40. TetherController.cpp
  41. TetherController.h
  42. ThrottleController.cpp
  43. ThrottleController.h