tree 5b59ee78467a146b23118127626e95cf7b5aa419
parent 9e15ad2566480486cb65ee43f1bc1f5808565a08
parent a9078dcf2c8a9611c3f7bea1ee2c4682f67b3cbf
author Remi NGUYEN VAN <reminv@google.com> 1619161034 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619161034 +0000

[automerger skipped] Merge "Use connectivity resources in service-connectivity" am: 03e53854e5 am: 5bbad161b4 am: a9078dcf2c -s ours

am skip reason: skip tag Change-Id I778d94a5aac0c4e20e78b1ba3a002495c17a38a0 with SHA-1 9f4fad49a5 is already in history

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

Change-Id: Iacd373f6c0e9296aa90d2cd366cd81868f37cfa7