summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-09-22 19:23:06 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-22 19:23:06 +0000
commit0ec10c8fdcd02b16c91807510a62c205eb807314 (patch)
tree108088e1c65c6a011d66dc7dcbfed130c6b741fe /tools/aapt2/diff/Diff.cpp
parent081bea189d59631d47cb7698578c3135e88ee5a4 (diff)
parent2a214fc5f2a6972d2404fa24f944a5c0c3b4b0e3 (diff)
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c -s ours am: 0029d03c0a am: afeaced48f
am: 2a214fc5f2 Change-Id: I95bd7f14d35808722c0453e6e441d3bc96528010
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions