diff options
| author | 2022-10-28 22:50:34 +0000 | |
|---|---|---|
| committer | 2022-10-28 22:50:34 +0000 | |
| commit | 5372ddf85f9ccaf39d83aa47f4203f94fbf79193 (patch) | |
| tree | acae64f33f35a0b9cff7b7d58c0500017ebc145e /libs/androidfw/ApkParsing.cpp | |
| parent | 053dd71dfd1fe059731068312eec271fbaa03116 (diff) | |
| parent | 49e2be67fee2ced1fabac8d71bc511c137a0c8e1 (diff) | |
[automerger skipped] Merge "[SettingsProvider] workaround for DevicePolicyResourcesManager" into tm-dev am: bda18f2799 am: 49e2be67fe -s ours
am skip reason: Merged-In I37a6ceb29575593018b93093562c85d49770a43c with SHA-1 3b873ef5c2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20306468
Change-Id: I14ed5985b83520ed85503fe6bcc7f78a06cfe638
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