summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-10-13 22:47:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-10-13 22:47:30 +0000
commita6b3caf58e8ab18f4c3164afb8fba25e9954198b (patch)
tree89fc993fb2e4da0dfb6ab3867ff72726ffb209cd /tools/aapt2/diff/Diff.cpp
parent790d332659cbb576bf57a74c9e52ad7b04b32f97 (diff)
parent6dbf67fc4889c49151415e986be98f70816f81ec (diff)
Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions