Bonian Chen 4486da9ea9 [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours ...

am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526 is in history

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

Change-Id: I5fd41f91894c3596eb24935b9ddc17dac3d4ddf5

2020-08-06 16:35:39 +00:00

libs

…

protos

…

res

Import translations. DO NOT MERGE ANYWHERE

2020-08-05 14:33:42 +00:00

src/com/android/settings

Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66

2020-08-06 11:21:50 +00:00

tests

Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa

2020-07-29 23:26:26 +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%