tree a7cc808a9eb0fdaddf7193396eb53d15a9b1a437
parent d9e76fbf0e9b803ec6c807623d37facc94ce0bb9
parent c53077244ff533f59335a070eefaf5de43494728
author Remi NGUYEN VAN <reminv@google.com> 1615996941 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615996941 +0000

[automerger skipped] Merge changes from topic "conn_resources_cp" am: 016e0b9261 am: 16763614c0 am: c53077244f -s ours

am skip reason: skip tag Change-Id Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a with SHA-1 50caf56267 is already in history

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

Change-Id: Id2bd09364da050578e7168cf7a38a87b1a724204