tree 4427b2755e697998334e16bcfd0d238b146bb768
parent 9f8a7ce4fa089f3b4e4c9aafd4718caabfe8d0ff
parent 01ec15840ae88e00b82bc153530141320ab2424a
author Abhijeet Kaur <abkaur@google.com> 1674601916 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1674601916 +0000

[automerger skipped] Canonicalise path before extracting relative path am: fd3c957757 -s ours am: ae8c215d8a -s ours am: 01ec15840a -s ours

am skip reason: Merged-In Id620644ffdfe20e9281773e2e23851c56732dd11 with SHA-1 43b718413e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/20942351

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