tree e10e072716be15572f82de687a9e7acc13d527ce
parent 2b2b0bf888aff1a2016782e5a30f344301311426
parent 5c11659c6264964fdc891437e00768976854dcbc
author Remi NGUYEN VAN <reminv@google.com> 1615779035 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615779035 +0000

[automerger skipped] Merge "Create a service-connectivity-pre-jarjar library" am: 1e976dd3af am: 64f37fc02d am: 5c11659c62 -s ours

am skip reason: Change-Id I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca with SHA-1 ab6440acc4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8606cfd56baed07c87dc7ae4ba0eb7292d57a72d