Merge changes from topic 'netd_aosp' am: d480f8af85 am: 7217fc7f75 am: eb2a5162b1
am: 6b0f19384b

Change-Id: Icba1f7d0428a2c71d165a7b7019df055a4bb939b
tree: 8a797105bf8877aaea37279374334856ed77efe7
  1. client/
  2. include/
  3. server/
  4. tests/
  5. Android.mk
  6. MODULE_LICENSE_APACHE2
  7. NOTICE