diff options
| author | Antoan Angelov <arangelov@google.com> | 2020-06-29 16:58:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:58:32 +0000 |
| commit | fae6068e4a6da2bfe110a4370ebed38b444ca212 (patch) | |
| tree | fcb91453cdad792dce37c8af4b151d3ea495b603 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 911ccc3a51c57c1cb9f16135a1b764dd8d1ed293 (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: I8024630d70035eddd19e25bbb0dfe76afbf38411
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions