app_Settings

Go to file

TreeHugger Robot ad20bb4875 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0313f1328 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iba3addc036b56f1a5ab431368e3f1dac952897ef

2020-10-07 18:19:37 +00:00

libs

…

protos

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master

2020-09-02 17:50:47 +00:00

src/com/android/settings

Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590 am: 423f9801e9

2020-09-28 02:53:19 +00:00

tests

Merge "Migrate away from deprecated Truth APIs." am: c5a500bf07 am: 1b69ab26e9

2020-10-06 11:05:22 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

[DO NOT MERGE] Add toggle for media resumption

2020-06-18 23:58:34 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Workaround for Recent app icon disappear

2020-06-16 17:30:32 +08:00

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…