| commit | 81fd9dd11c3b3d4bc74f6fc6618c2aa05e69c8ad | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Feb 19 07:50:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 19 07:50:03 2021 +0000 |
| tree | 141bf959e6055f8a3baa10a36126913d0f152d91 | |
| parent | 8de0b1a1cad6121ad5cf711cf85df71bfbd83898 [diff] | |
| parent | 8fed861718fd29dbc01f1fb3adb7bc6e6d1b19ff [diff] |
[automerger skipped] Merge "Use formal API for ActivityThread to set proxy" am: 86ecbddaf0 am: 2074561653 am: 8fed861718 -s ours am skip reason: Change-Id Ifb516194ecde1567cea4b6806946091cdcf2f015 with SHA-1 a1860ffaad is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512874 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I93f888c69346acc9e7bd3bfd77be2e3d5553f6d9