tree b47d175e2f00e432829e7aa2a883db647666121d
parent a01de16ce1f175bfdbf4e2d1fc3a8bfec85f27ba
parent 2bfe116fb5c5b84c8763f1148db42b1e697d30ff
author Winson Chiu <chiuwinson@google.com> 1673482409 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673482409 +0000

[automerger skipped] Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into sc-dev am: 2bfe116fb5 -s ours

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

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

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