tree 6b480e2bf4d6f566ebdbeeb368884e86e8d5c618
parent 83cc4b353877e791a23fd35a1aeb17d1dc7846d6
parent 231f777b02a9d1e85a06c14199b3dce69b31c67a
author Remi NGUYEN VAN <reminv@google.com> 1625541198 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625541198 +0000

[automerger skipped] Merge changes from topic "am-cc17cb7d48ea4bd7adc9183dc0c381e3-sc-dev" into sc-dev am: 0f956db686 -s ours am: 231f777b02 -s ours

am skip reason: Merged-In Ib95b58dab93f7adebc445b662a6d15db1ce0e7c2 with SHA-1 8ea5ee6d33 is already in history

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

Change-Id: Ib258eed5c800c66e32ca4ddf1341bef851d3f43e