app_Settings

Go to file

Bill Yi c134de54bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 088b27084b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ied68ca1769fdd1c63eff6731c5fef5a8e5a227f9

2021-09-03 20:56:41 +00:00

libs

…

protos

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-09-03 20:11:45 +00:00

src/com/android/settings

Merge "Revert "Support two pane design in the Settings app."" into sc-v2-dev am: 3377f1c04e am: aa472315b9

2021-09-03 17:26:32 +00:00

tests

Merge "Fix Robolectric broken on SplitController" into sc-v2-dev am: 6318bb23a0 am: fc37054461

2021-09-02 09:26:20 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Merge "Revert "Support two pane design in the Settings app."" into sc-v2-dev am: 3377f1c04e am: aa472315b9

2021-09-03 17:26:32 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Support two pane design in the Settings app.

2021-09-02 13:57:42 +00:00

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…