summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2016-04-22 08:41:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-04-22 08:41:10 +0000
commitff0ff67eccd784ccdd35b91ed182c50bb8df2d71 (patch)
tree8105043bf6d660278555c9328c311f01f6422c71 /tools/aapt2/diff/Diff.cpp
parentd212cfa107948adc986a179deb79aa6b62709b63 (diff)
parent636c07d9a9a6e48197706bd9724e5d5db4e2fe9d (diff)
Merge changes from topic 'blockOnProcessingUnsolicited' into nyc-dev
* changes: Tethering: interface updates can be handled again NativeDaemonConnector: add waitForCallbacks method
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions