tree 0ca33844eecfa685ab5994095e56e262a6261352
parent 35667ce4991f9128c9e5ed9be04d3df398d55d06
parent 4df498eb9a7ba2e8fc028c26af6648b286141d88
author Remi NGUYEN VAN <reminv@google.com> 1615866647 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615866647 +0000

Merge "Create ServiceConnectivityResources" am: eb46aa1c58 am: 4df498eb9a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620871

Change-Id: Ia7855ef7125726ecec0c4509b5026aeb5621cd3d