Shawn Lin 4ef7bb163e Merge "Update to use NAV_BAR_KIDS_MODE settings key for kids mode organizer" into tm-dev am: 8b8de88b3e ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665878

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

2022-04-18 04:02:41 +00:00

..

proto

…

res

Import translations. DO NOT MERGE ANYWHERE

2022-04-09 05:33:11 +00:00

src/com/android/wm/shell

Merge "Update to use NAV_BAR_KIDS_MODE settings key for kids mode organizer" into tm-dev

2022-04-18 03:41:27 +00:00

tests

Merge "Update to use NAV_BAR_KIDS_MODE settings key for kids mode organizer" into tm-dev

2022-04-18 03:41:27 +00:00

Android.bp

Merge "Add kotlin-annotations to WindowManager-Shell" am: b8e11a0afd am: 21b19f0f4f am: 3ba75e7300

2022-03-29 15:30:07 +00:00

AndroidManifest.xml

…