summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2016-09-09 10:52:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-09 10:52:43 +0000
commit2e8b25701a74b0a2950af4851053e134d7cc14e2 (patch)
tree84d26f06bcd3dfc96bfde9f41e0e54d9f5f3ff2e /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd1697846baa35b3e3d1ea0a9792945155ae74847 (diff)
parent19ebec6d36d3f3c3cd674c31db43bfa6b7956d15 (diff)
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc am: e9295560cf
am: 19ebec6d36 Change-Id: Idf28988f014023f04bda3d3ce77a37fc26863469
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions