[automerger skipped] Merge "Uri: check authority and scheme as part of determining URI path" into rvc-dev am: 546d9f8e41 am: 2f784d6dc1 am: ef33ed2993 -s ours am: 8725bfd850 -s ours am: 05aeb28226 -s ours am: e22cbd62bf -s ours am: 4ef79e0325 -s ours am: cbf4911a16 -s ours am: 9de5b282ac -s ours
am skip reason: Merged-In I06981d1c6e387b16df792494523994518848db37 with SHA-1 ad80758027 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17695640
Change-Id: I00ae1d755c8d2555cf323462ed1631e4b260c5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: