summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-19 23:13:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-19 23:13:15 +0000
commit7e66d1c563676200ec12c2b97a1231f8d704b73d (patch)
tree992541fc85502cf2de56f8742303990cbb0ad604 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent74ca3b31d47f6320c9d56c0789caf86cfe060719 (diff)
parent5882228ab896dec9243ebaff02550b999f71b5c2 (diff)
Merge "Merge "Key revocation check is permissive when device is unlocked" am: a9384cdc9b am: 3f638d9a3f" into qt-qpr1-dev-plus-aosp am: 5882228ab8
Change-Id: I39879ca88d139e51e71f2fa7050ff2ee5a67b96b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions