summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-19 08:11:39 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-19 08:11:39 -0800
commite9a00235c102d198a702bc665b2ea5b5e8c4bc07 (patch)
tree740208bf9b2aef8b1a8d085ba00e7d30653f2b50 /tools/aapt2/diff/Diff.cpp
parentb7d6ffd76f6c47af488494f5de9560ec490e8241 (diff)
parent0e49d20107ec1095447e166cb789e948c981d365 (diff)
Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions