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-03-04 10:32:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-04 10:32:09 +0000
commit21f010984fe539f829080037280a3326d513ea71 (patch)
tree4c5e60829ba34ab09700140872179603e3b19a41 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent78d96ec2af5c89c318a2e124672ae9dabd4598a1 (diff)
parent63e5bd6b4bcb734e051362f499258bb555df5db2 (diff)
Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 63e5bd6b4b
Change-Id: I1ab6d47c17992f8630d9aba892bcef29dcb66bfa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions