app_Settings

Go to file

Bill Yi 5da4aa3d50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours am: fb3e0ff793 -s ours am: 6e950044c0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1b5ea97edaeaa7111b5ff89f87673046d7813b51

2021-06-24 20:25:02 +00:00

libs

…

protos

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-06-24 19:54:30 +00:00

src/com/android/settings

Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: 5f5068f6df

2021-06-24 15:37:17 +00:00

tests

Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: 74446ce412

2021-06-24 15:17:59 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: 74446ce412

2021-06-24 15:17:59 +00:00

CleanSpec.mk

…

color-check-baseline.xml

…

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…