diff options
| author | 2022-10-28 22:42:02 +0000 | |
|---|---|---|
| committer | 2022-10-28 22:42:02 +0000 | |
| commit | 5798a863fba54ec7c2f9cafaa68265a1f9285b2e (patch) | |
| tree | 2d3e35183a21f5cbd961edb3191279deb15390d5 /libs/androidfw/AssetsProvider.cpp | |
| parent | 9846741d9706c352c67b9f812ffcab5691bdee8a (diff) | |
| parent | d958bbffff2be297fda6a2035bb21642bbc07459 (diff) | |
[automerger skipped] Merge "[SettingsProvider] workaround for DevicePolicyResourcesManager" into tm-qpr-dev am: 053dd71dfd am: d958bbffff -s ours
am skip reason: Merged-In I37a6ceb29575593018b93093562c85d49770a43c with SHA-1 b127850fda is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20302671
Change-Id: Ia9786797644767836264e2f1d67b7048e0bfb760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions