diff options
| author | 2023-05-05 03:32:23 +0000 | |
|---|---|---|
| committer | 2023-05-05 03:32:23 +0000 | |
| commit | d03e62fa5faa1b88980a270f65e13834a101f28e (patch) | |
| tree | ab3dd2f8bc2796fec29aef23b5ca5ec7d86faa38 /libs/androidfw/ApkParsing.cpp | |
| parent | dc8ef89ca3408610e39f93547f6db9b01e515dc1 (diff) | |
| parent | e292c2a197e541357c4f04d0507a9848829062f3 (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 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: I193ffcbcc30c4511877d45abc474620deafe44ea
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