tree edeb00536b3b2e9603424a811df3e0928ba77b73
parent 41f94ec8a1e002a2ecdccc72e9fdc42180050e1f
parent 700ffc994fee577dbe85d2194623f253c4d9f598
author Remi NGUYEN VAN <reminv@google.com> 1648227619 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648227619 +0000

[automerger skipped] Merge history of ConnectivityT am: 700ffc994f -s ours

am skip reason: Merged-In I67c703e3f7aa9d5787f032a79ed62e45412baf4f with SHA-1 41f94ec8a1 is already in history

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

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