summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-09-22 04:58:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-22 04:58:44 +0000
commit630d57734988cbae8b34a78904077c86114e2695 (patch)
tree559e7d2d70479757b3465d7e517e2a5778805139 /tools/aapt2/diff/Diff.cpp
parentf6d8037708d953e50ecb8d6f4c8ccfc7fbd3e9d8 (diff)
parentf65661939b955d9b3fde772c4b9aae1ba5dc3a4e (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 Change-Id: I05d4bdc92834197058c77ae31113c9783b558d8e
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions