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