summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorliulvping <liulvping@xiaomi.com>2016-09-30 01:27:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-30 01:27:48 +0000
commit4e4dfde6be418cf89bc66311b505f20359bcd9da (patch)
treede3c1117bcf62691dd659aad99156a06010cc5b5 /tools/aapt2/diff/Diff.cpp
parent23e07e74daabcd092dd0e5e5e9b8d551c0f5d007 (diff)
parentb2d9a6f7231d7965fc30ce8dee0319fbb62ba6d9 (diff)
Merge "Clear pending activity launches when force stop package" am: 00b678dd2d am: 5b65b132b3 am: 8b1f60a993
am: b2d9a6f723 -s ours Change-Id: I6f3e064f3a23f9619f0dc4ac9cf5bcfadd564165
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions