tree ac1619184de9b1e9fba56ae6c555447d6cf6e44a
parent 89c5bcf023015357eb84fb2d8ca5112b3c625f92
parent fb1f5458d0123871499ae4e77e6e492c85ef76ef
author Remi NGUYEN VAN <reminv@google.com> 1615866598 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615866598 +0000

[automerger skipped] Add ServiceConnectivityResources to tethering am: 60f4c2f425 am: fb1f5458d0 -s ours

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

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

Change-Id: Id4402eeca6b1ef035a1ca4f25a53b416a81f1609