tree 824f1539d9685297ec6de959e5211c0b832e3585
parent f9c75bb6e9afd5826f6a9b836d6d891b9cc05c6e
parent e6953d54a5f60f5e2aab72a24d5c9a422ae334a9
author Xin Li <delphij@google.com> 1646734959 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646734959 +0000

[automerger skipped] Merge "Merge Android 12L" am: e6953d54a5 -s ours

am skip reason: Merged-In I03636e6b8b4dc200fcb039b99190759bc7d5e776 with SHA-1 3acad24476 is already in history

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

Change-Id: Ib6efce0b06015a635915bb60e36af357031e99da