summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-04-27 21:15:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-27 21:15:43 +0000
commitd2b2ae912bca47afb60d231f31c06f1f3076cb22 (patch)
treebbc560311c37e21313573c545342d67ed6ce69a3 /tools/aapt2/java/JavaClassGenerator.cpp
parent61534f62cef591aef41131343e889add3e2584e4 (diff)
parent65f650b6ac7496c9179b3211be349dbb5bb1b6cd (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d48073491f -s ours am: 65f650b6ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473997 Change-Id: Icefb084d913386d4c131b00464e6a1d5d7903486
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions