summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2016-10-26 20:53:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-26 20:53:51 +0000
commit706d91242143f8c996ccfc6c602963c5c52d610d (patch)
treecaffe1ab1640ee87ebdb56489a597c1eb1b6addb /tools/aapt2/diff/Diff.cpp
parentcf3977282c1080d2a1578dcb59f7ae23cd0ba631 (diff)
parent3494413b99f36abaa6aba6efefeb210b04839455 (diff)
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am: e9db00e39f am: 5ac13dcb25 am: 69a039eb78
am: 3494413b99 -s ours Change-Id: If807066cabe2fee34fe1e2bcc5d76a4a1106fe3b
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions