[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: 2062a753ff -s ours am: 951029d976 -s ours

am skip reason: Merged-In I3bc6f542f6af692f79d464d085d971d2f2e60877 with SHA-1 ba815950b8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/17805329

Change-Id: I45d3bd3c2b8ef1b7f6ba462a46d11aa691c51ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: d77df8be5da02c85b80cb6ced8e0f2d807ff7f0c
  1. client/
  2. include/
  3. netutils_wrappers/
  4. server/
  5. tests/
  6. .editorconfig
  7. Android.bp
  8. NOTICE
  9. OWNERS
  10. PREUPLOAD.cfg
  11. TEST_MAPPING