Taran Singh 3dece06cb3 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours ...

am skip reason: subject contains skip directive

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

Change-Id: I00f3139da559d02c442c83cd68b6035f7f535a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2023-07-06 22:15:29 +00:00

libs

…

protos

…

res

Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac

2023-01-03 12:53:48 +00:00

src/com/android/settings

DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d

2023-07-06 21:08:52 +00:00

tests

Settings: don't try to allow NLSes with too-long component names am: b88fbf932a

2023-06-29 00:16:39 +00:00

.gitignore

…

Android.bp

…

AndroidManifest.xml

Remove the fallback AddSupervisedUserActivity.

2022-12-07 15:23:37 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Use Mockito 4.6.1 API

2022-12-29 00:47:06 +00: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%