[automerger skipped] Merge 10952656 am: 2565537291 -s ours am: 087ec79d52 -s ours

am skip reason: Merged-In I30b3f66750ec780b85c75000157f04298608a0e6 with SHA-1 5b717923e0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/connectivity/+/25090935

Change-Id: I2e95c5908e254ad68854cfcfeee5d95c13e3f76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 15c844eded4762fdadbfa7567d78871fc13d87e7
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. LICENSE
  7. OWNERS
  8. PREUPLOAD.cfg