commit | 12991a10d6cf655fd236a7e0fb1bee81ee35b62e | [log] [tgz] |
---|---|---|
author | Remi NGUYEN VAN <reminv@google.com> | Mon Jul 19 10:25:31 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 19 10:25:31 2021 +0000 |
tree | 99ae52223fa92ded9896c2e81eb3c96e119d63dc | |
parent | ee9c610fd6ec882b007ab2cbea74ef0b46f9033c [diff] | |
parent | ab157b3c5b4735f9720573192df3ae3584bd6456 [diff] |
[automerger skipped] Merge changes from topic "sdk_int_cp" am: 800eff01d0 am: ab157b3c5b -s ours am skip reason: Merged-In I1fbc0f714d539a664c053cb9cf1f86c3e651c5a2 with SHA-1 5798a37596 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686027 Change-Id: Ic2229b063f442b2651e014faad918bbf41db2400