tree acb5009ee0efb394fa03ba41526cba26e16e29a1
parent d841e1cd52271661510e467f59be30c5760262f1
parent ac863a9b6e6e46916714731239cdb5c5438f5232
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697142111 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1697142111 +0000

Merge "[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: 78e96991b1 -s ours" into udc-d1-dev-plus-aosp