summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-05-24 18:32:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-24 18:32:50 +0000
commit9f376da4b98621012e2663b88eabf866a9ed36f8 (patch)
tree2082c68791ac5b4c5737d1b6d5640313f1df3a1a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent226687cb4d007c0ad936a32547fa2a29d86b2672 (diff)
parentdcee8e5996f4c7f90a511a9eadfd0e90b1d60417 (diff)
Merge "[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: a7183b92c4 am: 95cb9a1cb3 -s ours" into pi-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions