tree 949d1a9da9c23449bbfee68df479d73d640f3513
parent 71d58cd5956d2f27ac0882346b3987af48491b1d
parent 11fa1522388ab7cef1ba6fe90a9a9fd0f8aba5c4
author Kiran Ramachandra <kiranmr@google.com> 1718993344 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1718993344 +0000

[automerger skipped] Merge "DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter" into sc-dev am: de5889aa13 am: c47b30dded -s ours am: 43668e40b3 -s ours am: da36819cff -s ours am: ef275f3662 -s ours am: bdd7d562d6 -s ours am: 2fb8cb913f -s ours am: 11fa152238 -s ours

am skip reason: contains skip directive

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

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