diff options
| author | 2023-10-12 19:48:50 +0000 | |
|---|---|---|
| committer | 2023-10-12 19:48:50 +0000 | |
| commit | 2407dae70bc92a396d0056c4a2e5f7f4b6dc724e (patch) | |
| tree | f675f4b8853fd43c3b028a5f3854f482c0aa1a32 /libs/androidfw/FileStream.cpp | |
| parent | 23954c970757bbd250402b3fcb40b578ad74436c (diff) | |
| parent | d974f62101a9b178181b799900ebc8661caba830 (diff) | |
[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: 499e70cc52 am: d974f62101 -s ours
am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 97f621d81f is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23835332
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593
Change-Id: I6cbad2764fd301b4a9cc1ad75886ee3b2de8a412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions