diff options
| author | 2023-10-12 20:02:47 +0000 | |
|---|---|---|
| committer | 2023-10-12 20:02:47 +0000 | |
| commit | 78e96991b1ae1aa960025a37b93f56237437ddbb (patch) | |
| tree | c5dc400e0a88a4d9d0154418f38f9a2af9831ea6 /libs/androidfw/ApkParsing.cpp | |
| parent | 5c2fe7e8a0b28e5b1c8d08cd5ca96313c901a91f (diff) | |
| parent | 4f70c066504f150e29a751962891f1ee53ccb88e (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: bf624d549f am: 4422416d9c -s ours am: 4f70c06650 -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: Ia6700fe14e18051992a77efa545f1c61044ca1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions