tree ebe44de56fa4d1d57a4d6f621e099cffe29aaafc
parent 47b4556fc017f3f2e51b0d916098aa24582e90bd
parent 21026d8bfb686e687d03a1f68e5bfcab26d5131c
author Xin Li <delphij@google.com> 1628889628 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628889628 +0000

[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: b5c6036c29 -s ours am: 21026d8bfb -s ours

am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15546967

Change-Id: Id06b722ffc5c36f71b7a8d05bebbfad28a5074b9