Gitiles
Code Review Sign In
review.blissroms.org / platform_system_netd / 9997f9a3edac2baac244c2fe8e49685a3be9f482
commit9997f9a3edac2baac244c2fe8e49685a3be9f482[log] [tgz]
authorJean-Baptiste Queru <jbq@google.com>Thu Jun 14 15:34:31 2012 -0700
committerJean-Baptiste Queru <jbq@google.com>Thu Jun 14 15:34:31 2012 -0700
tree3cbdf3c567dd211cf436b8396a6e51a3d923f275
parent034ed1763cf10f060f73d10ee6b4abef896fc3ef [diff]
parente36a3a2f998a62b0bf61d1ffff4a752746163cf4 [diff]
resolved conflicts for merge of e36a3a2f to jb-dev-plus-aosp

Change-Id: I566b0e96327f318313c17a11d35539554b075f59
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