diff options
| author | 2023-05-06 03:43:22 +0000 | |
|---|---|---|
| committer | 2023-05-06 03:43:22 +0000 | |
| commit | 84f37f7408788ee9ddaac250c81b9b3d7896875b (patch) | |
| tree | 18b6c161625211da2b08b5ca395d835a38da7433 /libs/androidfw/ObbFile.cpp | |
| parent | e99b007c262c985990eb7de0473123d05eee9394 (diff) | |
| parent | 206559a3cc5699edd57ffc58269071011df031a3 (diff) | |
[automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into rvc-dev am: 2a509c82ba am: 1678956190 -s ours am: 0a5315c6fd -s ours am: 337cd41d3f -s ours am: 6f8c5e373e -s ours am: 5bbfc0fc32 -s ours am: 6f584c5cac -s ours am: 206559a3cc -s ours
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22911665
Change-Id: I5b01a8716ac9e86487fabb50751e5a146902155b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions