Merge "[automerger skipped] Merge "[SettingsProvider] workaround for DevicePolicyResourcesManager" into tm-qpr-dev am: 053dd71dfd am: d958bbffff -s ours"
This commit is contained in:
committed by
Android (Google) Code Review
commit
0f409b16a5