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