diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-27 21:42:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 21:42:28 +0000 |
| commit | 48cb3da79222c6b81212a27dd5e0bec28c850db7 (patch) | |
| tree | d1c055c9a4dc4dd12cb8d50184d89597c3d63368 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 05bc9eb65d04eac7320257688b5bf99a61954b0a (diff) | |
| parent | 67352cf086d177e985bb970956652359420345dc (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into qt-dev am: e086a17e7d am: 67352cf086 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565
Change-Id: I9ff2e866bcd3f281e99bbf63fb557088dfe1f35a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions