Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / system / netd / 5b49ab9e27f06f5a59013b0d54e530d97cc2ef18
commit5b49ab9e27f06f5a59013b0d54e530d97cc2ef18[log] [tgz]
authorPaul Jensen <pauljensen@google.com>Thu Apr 03 19:06:00 2014 -0400
committerPaul Jensen <pauljensen@google.com>Thu Apr 03 19:06:00 2014 -0400
tree426a72b683e9e443d2cc4db0aa918851eb02b64e
parent5faac35cc84bae8c96775a5bc9026012378d6fd4 [diff]
parent45d7b7482e97b7445bf47fba3ffa3af764cadf48 [diff]
resolved conflicts for merge of 45d7b748 to klp-modular-dev-plus-aosp

Change-Id: I924e2c3c654501034dfa7429c0a54d0462fc1571
tree: 426a72b683e9e443d2cc4db0aa918851eb02b64e
  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. NetworkController.cpp
  33. NetworkController.h
  34. oem_iptables_hook.cpp
  35. oem_iptables_hook.h
  36. PppController.cpp
  37. PppController.h
  38. ResolverController.cpp
  39. ResolverController.h
  40. ResponseCode.h
  41. SecondaryTableController.cpp
  42. SecondaryTableController.h
  43. SoftapController.cpp
  44. SoftapController.h
  45. TetherController.cpp
  46. TetherController.h