tree df61c4d57b88df1f1292966341929bc79a37d5e7
parent 6257d62200a2c298077483ffbd35d8014ef663f3
parent ea1afdbb88f7738d564006e98c6ea9d047144d6e
author Xin Li <delphij@google.com> 1648969913 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648969913 +0000

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ea1afdbb88 -s ours

am skip reason: Merged-In I007dfcac3759ed90a91e67614bb952a6986ad6df with SHA-1 444446bc34 is already in history

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

Change-Id: Ie15c5b7f7b9ade3c430e3178387fd9a0adf957fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>