Xin Li d6c80bd8e3 Merge Android 12 QPR 3 ...

Bug: 236045730
Merged-In: Ie1e14a6b697af624854a9360a60383fac63bb02c
Change-Id: Ib7885655035baa9aa6add39f7a169f7c84d48138

2022-06-14 16:48:16 -07:00

libs

Sticky placeholder and adjacent finish rule in Settings

2021-11-09 22:32:58 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

res

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

2022-06-06 18:42:20 +00:00

src/com/android/settings

Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163

2022-06-14 06:59:22 +00:00

tests

Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163

2022-06-14 06:59:22 +00:00

.gitignore

…

Android.bp

Merge sc-v2-dev-plus-aosp-without-vendor@8084891

2022-02-11 07:29:32 +00:00

AndroidManifest.xml

Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0

2022-06-02 04:01:11 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Remove CryptKeeper

2022-03-08 17:13:22 +00:00

NOTICE

…

OWNERS

Add myself to OWNERS for emergency approval.

2020-11-26 01:34:01 +00:00

PREUPLOAD.cfg

Precommit hook added to Settings, preventing the creation of new Robolectric tests.

2020-12-10 14:40:49 +08:00

proguard.flags

Import the window extension libary in the Settings app

2021-08-24 12:01:35 +08: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%