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

Browse Source

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

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

...

This commit is contained in:

Chaohui Wang

2023-07-11 09:54:45 +00:00

committed by Automerger Merge Worker

parent 9a2e9c966b fc275fef2e

commit b515ed5fee

13 changed files with 312 additions and 254 deletions

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

BIN

tests/robotests/res/drawable/regulatory_info.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 159 B

BIN

tests/robotests/res/drawable/regulatory_info_sku.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 159 B

BIN

tests/robotests/res/drawable/regulatory_info_sku1_coo.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 159 B