diff options
| author | 2023-10-12 20:53:27 +0000 | |
|---|---|---|
| committer | 2023-10-12 20:53:27 +0000 | |
| commit | b0298ae544dfe08fd4158b8c824e667f7317d27c (patch) | |
| tree | f9c0791806a053897bda914e91cc40ec0ec224c1 /libs/androidfw/ApkParsing.cpp | |
| parent | d47b5318eb0f51688bb7f35df746d8135f4a618e (diff) | |
| parent | 83f198fa79e8ec8914b39944633e045be0183873 (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 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: I85fc4320cd564c4320560274af5b6c01824dc718
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