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-12 10:17:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-12 10:17:09 +0000
commit5ff740f15b22eed79a4ec49b38e88b843a465a6a (patch)
tree4d1773fd138ad669542e64befc0be76fb9399732 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent806bb8bb38eed20361d69b4e980ee4453ae58e54 (diff)
parent4bf451c3217a16c211e9c988d5411c15931fcc0a (diff)
[automerger skipped] Merge "Expose NETWORK_STACK permission for system and test API" am: 97c24fb167 am: 23fa19dce9 am: 4bf451c321 -s ours
am skip reason: Change-Id I27061280b0c49677fa651c6f9799e48b78e4c109 with SHA-1 b73c737ffc is in history Change-Id: I58b0d00abbf0c598e0683f9599acb8340575b9e8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions