tree f9c0791806a053897bda914e91cc40ec0ec224c1
parent b0298ae544dfe08fd4158b8c824e667f7317d27c
parent d841e1cd52271661510e467f59be30c5760262f1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1697144043 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697144043 +0000

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2a2 am: ccc748a0d7 am: 2929859166 am: b11212b320 am: 3569c11009 am: 22454204a6 am: bf624d549f am: 4422416d9c -s ours am: 4f70c06650 -s ours am: e04fcd5b04 -s ours am: d841e1cd52 -s ours

am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8cc is already in history

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

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