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-03-30 22:17:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-30 22:17:39 +0000
commitee86dc27372eff5f6ff567261adc759cd0be3bf4 (patch)
tree59b946f69b2d408ee891c8a4d3c2773d1e372a7f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent2b1e63ed60a155d687538faf1df44fec2acc6c46 (diff)
parent7ab5942838f0b826a915ed2adbc9c924c4db72bf (diff)
Merge "[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am: 34ce11f2bd am: f6ab9a5f96 -s ours" into pi-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions