tree e2c2837fb3b9d7d0b0c0b0407e26048e301627f4
parent d8b183c8ae28708b2d28a8d22bbbfa5e5f0e7424
parent 1242dc1a2862497b27f152c0dbe794dd6914449c
author Bill Richardson <wfrichar@google.com> 1520544967 -0800
committer Bill Richardson <wfrichar@google.com> 1520556399 -0800

Merge remote-tracking branch 'goog/upstream-master' into nos-merge-upstream

Bug: 63388215

* goog/upstream-master:
  Fix Android build
  wait_for_interrupt() should be able to time out
  Add LOG_TAG for libnos_transport functions
  Remove protobuf build hack.
  The Linux citadel_updater accepts a default device
  Add function to reset a device.

Change-Id: I0eda9d26092aa8e8e5aafaf86c87aadc338bdf79