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