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-07-09 00:52:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-09 00:52:02 +0000
commitd092b8c5110f1c04aa3544308d13acfd54c44d58 (patch)
tree04bfd9884bc82275df86e98c70c2e3dda0b5c51b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6f79ebfd17a5308646dd06bb7c69138dde6b97d0 (diff)
parent8b869b6191e2ddcad4fa8b74fedbeb1d0c3650cc (diff)
Merge "[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -s ours am: eebb20887b -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions