summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-01-08 13:02:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-08 13:02:02 +0000
commit639e6eb5cfd041e652ba9284076efd56bf64118c (patch)
tree9b4b72c8e0091f8a66322f57e30b6fb787deca1b /tools/aapt2/java/JavaClassGenerator.cpp
parentfe39a927b58ea563f567f94bd252fd490024df5f (diff)
parente88250ddfabec58fd19696e94ff725fc91635782 (diff)
Merge "Grant shell MANAGE_PROFILE_AND_DEVICE_OWNERS permission" am: 945be59043 am: e88250ddfa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530318 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0d1357ca43af78e20ce09ce8fbb727cdcd9a5bad
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions