summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2016-09-08 07:57:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-08 07:57:53 +0000
commit7f53e558d1b138d4b2ec371e961d365ab5a873f6 (patch)
tree84a96509b2e92ff84a0de664a8dfc09e1f3e4521 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent52dc948bbe5650fa24615c17258be03a7276b1d9 (diff)
parentc3002713e10f583f87d8fa3efc49215ae16b0479 (diff)
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 am: 4407f375a0
am: c3002713e1 Change-Id: I2f63d7713696550c7edffb39a65613a4d4152c34
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions