diff options
| author | Antoan Angelov <arangelov@google.com> | 2020-06-29 17:33:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 17:33:34 +0000 |
| commit | 3f487b614cb5469e3c3435080540dc7246f4392d (patch) | |
| tree | 8cb2372bc5e6aae236c3469683bfb2993f2f88c5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 84eb4b218467984d4a4ac153fb29ff7e122e765b (diff) | |
| parent | 457bec5f6b40ffa4c2f22f1378242cf765057655 (diff) | |
Merge "Also skip calling ShortcutManager APIs if work user is locked" into rvc-dev am: 625ada924d am: 2e53c54ab9 am: 5725c4a897 am: 457bec5f6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034926
Change-Id: I86af5836b8b2e3a50c58b9cc74f443466f28952e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions