diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-03-03 13:07:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 13:07:08 +0000 |
| commit | 65f650b6ac7496c9179b3211be349dbb5bb1b6cd (patch) | |
| tree | 8300eb1fa38f05f53ee6a356e8eff00b39931c1e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6c6d48d22897f15125faa517bb3cba92ce868819 (diff) | |
| parent | d48073491fa52416dc4a7212501e318b76412cc3 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d48073491f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473997
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I83234b1a9f929653c3d221d86101831236ea7bf2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions