diff options
author | Antoan Angelov <arangelov@google.com> | 2020-06-29 16:59:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:59:37 +0000 |
commit | 321f4920234ec1ede4aa5e639590f6b6db7f135e (patch) | |
tree | fcb91453cdad792dce37c8af4b151d3ea495b603 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 61b4ea3a119a4f3b7e04e9ba2190243b2daf001b (diff) | |
parent | a1a3d48274b86ccb758c65457dad2fc3baca8082 (diff) |
Merge "Also skip calling ShortcutManager APIs if work user is locked" into rvc-dev am: 625ada924d am: a1a3d48274
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034926
Change-Id: Ie41d51028d6fb13028f6de1ffc8887416ad52613
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions