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