tree 193dfc7f9a6348d01b8edb2c7414f7e9cc9380c5
parent d6e3e4ee7aeade61158e6892c563bbe7e3abfde2
parent 449789aa64637daeb01d3e59b9ecd39ce8cde1d7
author Winson Chiu <chiuwinson@google.com> 1673842928 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673842928 +0000

[automerger skipped] Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into tm-dev am: 814f30b8cf am: 669d3ca22c -s ours am: 449789aa64 -s ours

am skip reason: Merged-In Ic34b3f796b762763db5aa7b5d7c109ae70607470 with SHA-1 0d561708bc is already in history

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

Change-Id: I9f45eb610f028e7b9b831d557d79e5d203778931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>