summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-06-09 00:28:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-09 00:28:54 +0000
commite36da9c8c9f8f50a47dd985f795dbb2b24cbef54 (patch)
treefa2129f96a593e6f37ac8e6191b6b2cbe3903f80 /tools/aapt2/diff/Diff.cpp
parent18227e483167c590121fd300d03c999dd057204c (diff)
parent3d5e396583a845e63e102ff449d856c01125f550 (diff)
Merge "Revert "Temporarily increase timeout for devices with buggy driver"" into nyc-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions