[automerger skipped] Merge "Add OsCompat" am: 1e2ad80467 am: b7d8d93ac9 -s ours am: 4dd89c5320 -s ours

am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I8a4137488f83577d4ce6720a8be71d8e2da84d91
This commit is contained in:
Remi NGUYEN VAN
2021-06-04 10:59:20 +00:00
committed by Automerger Merge Worker

Diff Content Not Available