[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 9cb9644148 -s ours

am skip reason: Merged-In I4ee0872fbeee8af90cca0bf4851f074242f5dafb with SHA-1 3c7817628b is already in history

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

Change-Id: I6659d8199e4605aad873f11af62ca6816ab8ba60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 78a5f87e4eae53aa5065387faddde707b00e8b28
  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