summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-07-28 21:03:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-28 21:03:10 +0000
commitf0d42a9fcaa2946dc729b8a2cf34aca6abc20c12 (patch)
tree630988f29ee20a6cda10fd4a08dcccceeb645c73 /tools/aapt2/diff/Diff.cpp
parent691b81042f0d443dc16d82426c043d4a3f76378a (diff)
parent048995f403589ac71b440c18a81082ff26b2287d (diff)
am 048995f4: am eb80a86d: am 359f1e91: am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev
* commit '048995f403589ac71b440c18a81082ff26b2287d': Don't use screenshot if structure is disabled (1/2)
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions