Xin Li d92daf10ef [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558 -s ours ...

am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8 is in history

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

Change-Id: I0d548c1b5c061e4ee753808040af883dd59cb3ee

2020-09-01 20:37:15 +00:00

libs

…

protos

…

res

Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53

2020-09-01 04:40:24 +00:00

src/com/android/settings

Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5

2020-08-19 15:08:01 +00:00

tests

Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp

2020-08-17 20:11:11 +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

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%