tree 6e52e9ef9958fc8d96c54e30e00a2b42221d9c35
parent a517b6c99c408ddbe84ce21c3aecd5ccb96b9379
parent 5e64dfeca3d7f0e8da157e5b6db37b801a1c7df8
author William Loh <wloh@google.com> 1720819937 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1720819937 +0000

[automerger skipped] Merge "Fail parseUri if end is missing" into sc-dev am: de4baa7caa -s ours am: 3473ac0994 -s ours am: 0f321a944e -s ours am: 4f0ff92be9 -s ours am: 6e12f30618 -s ours am: 6d130fcd8b -s ours am: 5e64dfeca3 -s ours

am skip reason: Merged-In I5f619ced684ff505ce2b7408cd35dd3e9be89dea with SHA-1 50896e77e4 is already in history

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

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