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-01-23 18:28:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-23 18:28:04 +0000
commitc2ddc0976d20643b8c2147ef1807f69150f571bb (patch)
tree2a695da343ced996802c25c1e5a452d8566899e8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc05f3aaf0172713a9480419f55e4607c7d40493b (diff)
parenta549738ce5eb98c30ab68f11a324cc1fd36a15d4 (diff)
Merge "Add list of Administrator UIDs to NetworkCapabilities." am: 38812f345c am: a549738ce5
Change-Id: I1636f33bf5667442ee9a0b9d463e1ce4bcb2b737
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions