Skip to content
Commit 7b971154 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am:... 

Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: 104426a0 am: 04cc4f79 am: 5486c676

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I409cdb32c181fbd2397fbe2e2a1ff9437b755f40
parents e503bf9d 5486c676
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment