Antoan Angelov 2e53c54ab9 Merge "Also skip calling ShortcutManager APIs if work user is locked" into rvc-dev am: 625ada924d ...

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

Change-Id: Icd5e64ff7e9495862edaa1c9548bbff7320d7831

2020-06-29 16:47:11 +00:00

..

java

Merge "Also skip calling ShortcutManager APIs if work user is locked" into rvc-dev am: 625ada924d

2020-06-29 16:47:11 +00:00

jni

Merge "WM: Replace eEarlyWakeup flags with explicit eEarlyWakeup start and end flags" into rvc-dev

2020-06-18 04:36:03 +00:00

proto

Merge "Correct the name of enum UserType item" into rvc-dev

2020-06-22 17:06:58 +00:00

res

Import translations. DO NOT MERGE

2020-06-26 21:17:48 -07:00

tests

Merge "Also skip calling ShortcutManager APIs if work user is locked" into rvc-dev am: 625ada924d

2020-06-29 16:47:11 +00:00

xsd

…

TEST_MAPPING

…