Google Git
Sign in
ara-mdk / platform / system / netd / 9a0ae9b77dd8d886faa93b7360277e09417ba11c
commit9a0ae9b77dd8d886faa93b7360277e09417ba11c[log] [tgz]
authorJean-Baptiste Queru <jbq@google.com>Mon Mar 11 13:44:45 2013 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Mon Mar 11 13:44:45 2013 -0700
tree8325186b61b3bf89ab3f7a3ce4951434c4aa4d15
parentcfd1a58237c5fe84ddd30c9a73dd361697060aed [diff]
parent484bdcab1e7e64c2ad6ee36b9d216dbc94e82608 [diff]
am 484bdcab: am 63790dce: am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '484bdcab1e7e64c2ad6ee36b9d216dbc94e82608':
tree: 8325186b61b3bf89ab3f7a3ce4951434c4aa4d15
  1. Android.mk
  2. BandwidthController.cpp
  3. BandwidthController.h
  4. ClatdController.cpp
  5. ClatdController.h
  6. CleanSpec.mk
  7. CommandListener.cpp
  8. CommandListener.h
  9. DnsProxyListener.cpp
  10. DnsProxyListener.h
  11. FirewallController.cpp
  12. FirewallController.h
  13. IdletimerController.cpp
  14. IdletimerController.h
  15. InterfaceController.cpp
  16. InterfaceController.h
  17. List.h
  18. main.cpp
  19. MDnsSdListener.cpp
  20. MDnsSdListener.h
  21. NatController.cpp
  22. NatController.h
  23. ndc.c
  24. NetdCommand.cpp
  25. NetdCommand.h
  26. NetdConstants.cpp
  27. NetdConstants.h
  28. NetlinkHandler.cpp
  29. NetlinkHandler.h
  30. NetlinkManager.cpp
  31. NetlinkManager.h
  32. oem_iptables_hook.cpp
  33. oem_iptables_hook.h
  34. PppController.cpp
  35. PppController.h
  36. ResolverController.cpp
  37. ResolverController.h
  38. ResponseCode.h
  39. SecondaryTableController.cpp
  40. SecondaryTableController.h
  41. SoftapController.cpp
  42. SoftapController.h
  43. TetherController.cpp
  44. TetherController.h