tree 5196cb3000b9b4ba389441fb45771df9eca4a46f
parent d683ab76c2fdba0b80d5b970be13cf4e22eeede7
parent 6221fdb4e2702a7d99e658b5282cb8c618be7d43
author Remi NGUYEN VAN <reminv@google.com> 1648228100 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648228100 +0000

[automerger skipped] Merge history of ConnectivityT am: 700ffc994f -s ours am: 2e7e455872 -s ours am: 6221fdb4e2 -s ours

am skip reason: Merged-In I81893df9f327abb84f1561b2b33027a2d23a4d65 with SHA-1 f0ca0a38bb is already in history

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

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