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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b

2021-01-03 05:24:18 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Card showing mechanism change in homepage

2020-02-14 17:44:11 +08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2020-12-20 18:43:29 +00:00

src/com/android/settings

Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45 am: ac0f1fc20c

2020-12-29 18:05:57 +00:00

tests

Merge "Change carrier config" am: ba38382627 am: 3d9ede1815

2020-12-22 01:35:07 +00:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.bp

Revert^2 "Add <uses-library> information."

2020-12-14 22:05:04 +00:00

AndroidManifest.xml

Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45 am: ac0f1fc20c

2020-12-29 18:05:57 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Workaround for Recent app icon disappear

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

NOTICE

…

OWNERS

Update the OWNER files

2020-03-11 16:45:14 +08:00

PREUPLOAD.cfg

Add the checkstyle_hook into PREUPLOAD.cfg

2019-10-14 21:03:17 +08:00

proguard.flags

Revert "Update proguard"

2019-02-06 15:44:40 +00:00

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%