Skip to content
Commit 09faec96 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Use formal API for ActivityThread to set proxy"... 

[automerger skipped] Merge "Use formal API for ActivityThread to set proxy" am: 394170f9 am: b70ef11f am: 8a1fc93c -s ours

am skip reason: Change-Id Ifb516194ecde1567cea4b6806946091cdcf2f015 with SHA-1 a26ffd97 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93f888c69346acc9e7bd3bfd77be2e3d5553f6d9
parents acaa6434 8a1fc93c
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