| commit | 38132a33bb286aab37d63ec1083e5366d3198038 | [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 | b3a9f8b6cef421f7eaa7100b2791525befe2e192 | |
| parent | ac1ff1f293f8ed9312b7c74a771e0de171ae21ec [diff] | |
| parent | 5796505d2a05b0e281beb95783e5c5fed7af47ba [diff] |
[automerger skipped] Merge "Use formal API for ActivityThread to set proxy" am: fb0f9e3275 am: 5796505d2a am: 8a1fc93c4d -s ours am skip reason: Change-Id Ifb516194ecde1567cea4b6806946091cdcf2f015 with SHA-1 8a831d6e07 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512874 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I93f888c69346acc9e7bd3bfd77be2e3d5553f6d9