summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-09-22 07:39:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-22 07:39:22 +0000
commitc9830d56e50262a7d65e69523b2a14ad4ea04b8a (patch)
tree108088e1c65c6a011d66dc7dcbfed130c6b741fe /tools/aapt2/diff/Diff.cpp
parent90eafb53220f2a50acf5a92b303cd1aa5a007d7c (diff)
parent630d57734988cbae8b34a78904077c86114e2695 (diff)
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours am: d4fe288933 am: f65661939b
am: 630d577349 Change-Id: I812cd00912fad74e9f07a6881bec4b93e6e71490
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions