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