summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorMichal Karpinski <mkarpinski@google.com>2017-01-26 15:05:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-26 15:05:01 +0000
commit3ac59620f10c284e91c135d185c2b30f2e6b7f10 (patch)
tree1b654ff7a96562f33fbec24bdf0d7908fba5e0b6 /tools/aapt2/diff/Diff.cpp
parentc6f8137e47f93ffedf17676ab838aebd8ada53df (diff)
parent666e59f911376e3c9c04b456a0d589643955e167 (diff)
Merge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm" into nyc-mr2-dev am: c399e4d964
am: 666e59f911 -s ours Change-Id: Ie934c7a6e884eb13a23a620c43bab68b989cb454
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions