diff options
| author | 2023-10-12 21:12:33 +0000 | |
|---|---|---|
| committer | 2023-10-12 21:12:33 +0000 | |
| commit | 4994f86a6152c216877bca0573625051e4016de2 (patch) | |
| tree | 25045a84f3709c2b9ce42816c9b0ff14b6048e2f /libs/androidfw/FileStream.cpp | |
| parent | 7af7093a7b53727f4961efb052a3137cd4f97e2c (diff) | |
| parent | b0298ae544dfe08fd4158b8c824e667f7317d27c (diff) | |
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: 499e70cc52 am: d974f62101 -s ours am: 2407dae70b -s ours" into udc-d1-dev-plus-aosp am: 83f198fa79 -s ours am: b0298ae544 -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: I68aa803812ea812db90551a77bfa95e51bfed2ba
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