diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 13:03:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-03 13:03:13 +0000 |
| commit | 09eb1365c6a0cceb34e892d24b39ad915fe2ac12 (patch) | |
| tree | 5d5f37f7081917dc8e9fb61058ed2c8e3fac45e6 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | d068d394a556a438e460996c5df13f73ab499008 (diff) | |
| parent | eb351b554c0da47406a81f0b1fcf58d6d17f7477 (diff) | |
Merge changes from topic "am-63843d5c32d447738964aada8df755cc" into rvc-qpr-dev-plus-aosp
* changes:
Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-qpr-dev am: 27ea4217af
[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: acb731f978
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions