diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-04 18:05:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-04 18:05:28 +0000 |
| commit | e3a1235c4b0dd95bd27c9afd3822d29836c15502 (patch) | |
| tree | 0803e540e44ba76115f7875c409ab73a2a59caa6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3c115495a001e45c18a32bb8ed20698c2425b5a8 (diff) | |
| parent | 95d9a6c11cc5ed2b48b47ad3e6a5eb585aac7b23 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into pi-dev am: 95d9a6c11c -s ours
am skip reason: subject contains skip directive
Change-Id: I09e99b330c3000605f37270399916b75c00160e8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions