tree 9553299371d9ad3165b10eddeb5d2253d022831f
parent 22d9f95a9ad603fc93c3689e80093893aa3b0a8d
parent 5aec9c87e4077437c6a4e2cf3546250300acc65c
author Remi NGUYEN VAN <reminv@google.com> 1610416902 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610416902 +0000

Merge "Revert^2 "Set setCurrentProxyScriptUrl as public"" am: 5aec9c87e4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97d232b365e868b1533d0600778f7dbb823a4d2a