| commit | 09faec9621f9da68c64434626932546bbcea8046 | [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 | 4a989f07d036fcf1c52f774b6a39adb31d68aff1 | |
| parent | acaa6434975d89185cf75fe6ab31980261b8f104 [diff] | |
| parent | 8a1fc93c4d5752072b9c25fa98b657506c204c66 [diff] |
[automerger skipped] Merge "Use formal API for ActivityThread to set proxy" am: 394170f9cc am: b70ef11f73 am: 8a1fc93c4d -s ours 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