tree e1752b692762c885571fccf09cf362f6d3eff4f3
parent 389932d249612a54622011973f08c3360bd4f614
parent bb1b31a3aa345292871d6d8662d6b33934d5b116
author Lorenzo Colitti <lorenzo@google.com> 1461314911 +0000
committer android-build-merger <android-build-merger@google.com> 1461314911 +0000

Merge changes from topic \'blockOnProcessingUnsolicited\' into nyc-dev am: ff0ff67ecc
am: bb1b31a3aa

* commit 'bb1b31a3aa345292871d6d8662d6b33934d5b116':
  Tethering: interface updates can be handled again
  NativeDaemonConnector: add waitForCallbacks method

Change-Id: I38ea1019a14b5bf16c7302c3ac3c53a11b44bfba