diff options
| author | 2023-05-05 03:36:38 +0000 | |
|---|---|---|
| committer | 2023-05-05 03:36:38 +0000 | |
| commit | e03f7881d75e3419dbab9f336372146c62c403bb (patch) | |
| tree | 8f6acc970718c7024072e4b5fa4938b21f617dcb /libs/androidfw/ApkParsing.cpp | |
| parent | babc5c7336049cac1d4dc51b0ddb80e8a489da73 (diff) | |
| parent | d03e62fa5faa1b88980a270f65e13834a101f28e (diff) | |
[automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours am: 8486a0b6ae -s ours am: efcfb1e068 -s ours am: 402d56a97f -s ours am: e292c2a197 -s ours am: d03e62fa5f -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/+/22915959
Change-Id: I4e80f7e2dbf71e5ee2117941f83b250a582d7ff1
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