app_Settings

Go to file

Bill Yi e02435c0d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I49e9c3a2001f1132248274c6aa9c6b6e7644b8da

2020-09-11 16:46:19 +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 "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b am: 42710f069d

2020-09-11 08:42:31 +00:00

tests

Add explicit dep on framework-wifi.impl

2020-09-02 15:41:40 +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

…