[automerger skipped] Merge "Use formal API for ActivityThread to set proxy" am: 394170f9cc am: b70ef11f73 am: 8a1fc93c4d -s ours

Browse Source

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93f888c69346acc9e7bd3bfd77be2e3d5553f6d9

...

This commit is contained in:

Treehugger Robot

2021-02-19 07:50:03 +00:00

committed by Automerger Merge Worker

parent acaa643497 8a1fc93c4d

commit 09faec9621

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available