Chaohui Wang 1806b3032f Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: I46c9e35554f3a7021bb52c79cc73e09971ca4232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2023-07-11 08:34:42 +00:00

..

res/drawable

[Regulatory Labels] Load labels from overlays

2023-07-07 14:52:26 +00:00

src/com/android/settings

Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a

2023-07-11 08:34:42 +00:00

Android.bp

Move ComposeContentTestRuleExt to SpaLibTestUtils

2022-11-22 00:30:52 +08:00

AndroidManifest.xml

Fix not displaying "Allow restricted settings"

2023-03-20 19:40:06 +08:00