summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2016-09-09 10:44:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-09 10:44:45 +0000
commitd1697846baa35b3e3d1ea0a9792945155ae74847 (patch)
tree84d26f06bcd3dfc96bfde9f41e0e54d9f5f3ff2e /tools/aapt2/diff/Diff.cpp
parent300f7438d8fbbdc5fd50e1bd12855bb5c534538f (diff)
parent7aba7234e13dc1ce28f5314ced22f838e5cf6a8b (diff)
Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 am: 8f0cc3dd13 am: 8cb6b9335c am: eb972e5d9d
am: 7aba7234e1 Change-Id: I8c33caec1a869caa4ea3d1b7e2cfcb3a9a6787ea
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions