diff options
author | Antoan Angelov <arangelov@google.com> | 2020-06-29 17:35:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 17:35:04 +0000 |
commit | a1667cb8cac6007f977a439855407216e834bea2 (patch) | |
tree | 8cb2372bc5e6aae236c3469683bfb2993f2f88c5 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | b63bf73cf751100753abc0e94bdd9cd23f8a6d56 (diff) | |
parent | dde6cc46d168d1bc719e3074ec06e406cca46eb1 (diff) |
Merge "Also skip calling ShortcutManager APIs if work user is locked" into rvc-dev am: 625ada924d am: a1a3d48274 am: 321f492023 am: dde6cc46d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034926
Change-Id: I2f20bd8d60f517754c266fd1eb21c5124b7accd5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions