[automerger skipped] Merge "[SettingsProvider] workaround for DevicePolicyResourcesManager" into tm-dev am: bda18f2799 am: 49e2be67fe -s ours am: 5372ddf85f -s ours

Browse Source

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: I09d0f3d6e489ee7063f2de2cadd4e29cd07636c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Song Chun Fan

2022-10-28 23:32:22 +00:00

committed by Automerger Merge Worker

parent d958bbffff 5372ddf85f

commit 4d038ce19e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available