summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorNicolas Prévot <nprevot@google.com>2016-06-22 12:27:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-22 12:27:14 +0000
commit2058553b8d57ac7156aad6387c0e9b397ce6f265 (patch)
tree2e1dd310549ab894ef39bcf03a7a0d8fe54a064c /tools/aapt2/diff/Diff.cpp
parentc211539769dfaa507cfaf7dc22e9feb56065018c (diff)
parent1219c924bdf98fd5342fe5bb7cd09da1012d2e1a (diff)
Merge "Don't allow showing an activity if user is stopping or shutting down." into nyc-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions