diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-27 21:42:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 21:42:08 +0000 |
| commit | ad4df34c139f33000e663d315bb2aaaa86305e1b (patch) | |
| tree | d1c055c9a4dc4dd12cb8d50184d89597c3d63368 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 9d21d885df1e81f25b32a0ad8d399bfb026b11ca (diff) | |
| parent | d2b2ae912bca47afb60d231f31c06f1f3076cb22 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d48073491f -s ours am: 65f650b6ac am: d2b2ae912b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473997
Change-Id: I49572c1cca89aac85c3246f3d53883565c650114
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions