summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2017-02-15 21:37:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-02-15 21:37:34 +0000
commit9a044dad009b52f079dc780617316e973ce3f212 (patch)
tree72d0b25855a97a8498c8422259a9f796c69c9fb0 /tools/aapt2/diff/Diff.cpp
parent74841fb59f12e153d43a1c5e4283fd1e01ad83ee (diff)
parenta211bc1a03ba117bff7e0376f1973066de918f51 (diff)
Merge changes from topic 'revert-anr-revert'
* changes: Process queuedWork on main thread and add logging Revert accidential merge 492a058d58e991445996cb8cc8dcb24494ac20c5
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions