tree 4918bcea8f45ac796f439d165f1bafda150f720e
parent 173d8e35107ef6903313fc02bbd73a7c9fdb07da
parent a3012478105072eccce918311c278461beaa6a37
author Frank Li <lifr@google.com> 1646277303 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646277303 +0000

[automerger skipped] Merge "[MS68.4] Address comments at aosp/1958144" am: 481c0cd100 am: a301247810 -s ours

am skip reason: Merged-In I2578e13e2844591adac1d1902f2454ec7079ceea with SHA-1 21d9760250 is already in history

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

Change-Id: I7c65bea655e9045ed1aaf643918fa170575858f0