tree 7a665a1dac9c976c2bb347e22d5b3e8bc4228e2f
parent 1c2606742da1fe79f205f1b5a2617b04c9cc5736
parent ec5b8f3b2465fdabda6db01bf10a1b899682d213
author Remi NGUYEN VAN <reminv@google.com> 1616019659 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616019659 +0000

Merge "Remove Protocol.BASE_* usage in Connectivity" am: 7ffb87e4ce am: e4a8d2ff33 am: ec5b8f3b24

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

Change-Id: I0bb7aec183efdeed894447a3b5abc446b9ca46c8