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 16:38:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-02-19 16:38:16 +0000
commit5882228ab896dec9243ebaff02550b999f71b5c2 (patch)
treea96320fc44ccd0392d3a262fe3c9982431e83a4a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent27e9268447f9f32cebe53cadd782130114aa10f2 (diff)
parentf2086f7b183c1e4cc1b7273f8786e278fab77c23 (diff)
Merge "Merge "Key revocation check is permissive when device is unlocked" am: a9384cdc9b am: 3f638d9a3f" into qt-qpr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions