app_Settings

Go to file

Bill Yi 7fa35a5808 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours am: 9f379245bb -s ours am: 528d97bbee -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iefd1ea9870a83cad04af97d6ba7a6e3462bd816b

2021-08-18 00:36:23 +00:00

libs

…

protos

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-08-17 20:18:07 +00:00

src/com/android/settings

Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev am: 0a308d056b am: c4234a86a8

2021-08-17 17:48:09 +00:00

tests

Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d am: 9ee42fc623 am: e016e0b03f am: e53111b6a0

2021-08-17 10:01:24 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: 7b6c01cf2c

2021-08-09 13:01:10 +00:00

CleanSpec.mk

…

color-check-baseline.xml

…

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…