summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-04-06 13:24:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-04-06 13:24:48 +0000
commit343715b1c195dc08bce4157bdfb58403679aa9e5 (patch)
treef18340aba4a24dc7b492c376d40ff6155d27353f /tools/aapt2/diff/Diff.cpp
parent2242ff73b83e6dfaa97b6e8e55bf4301b41b89d5 (diff)
parent5c2cf03f5f8e26f715931370004d21ee217edcde (diff)
Merge "Do not stop lock task if it is starting background user" into oc-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions