commit d8279e8dd2fcab1066afcb25bfbf82222546d6a8
author Tomasz Wiszkowski <ender@google.com> Wed Aug 09 12:27:15 2017 -0700
committer Greg Hartman <ghartman@google.com> Mon Oct 09 17:29:28 2017 -0700
tree 6a83b365fb6d8b67fbe1888fe15db0ca91b159f9
parent 42d9321b8e2c1ecf8eb0a4a460f9ac9d8852bfd1

fix merge conflict resolution error - bad include path

Change-Id: I2374dc50a302b0b4000aff0fc37837bc901b9401
(cherry picked from commit 2d75652233cb2b4b8bc993ed855cf0eb4b91ac2d)

vadb/usbip/vhci_instrument.cpp

diff --git a/vadb/usbip/vhci_instrument.cpp b/vadb/usbip/vhci_instrument.cpp
index 9a2b8a2..8311de8 100644
--- a/vadb/usbip/vhci_instrument.cpp
+++ b/vadb/usbip/vhci_instrument.cpp
@@ -24,7 +24,7 @@
 #include "common/libs/fs/shared_select.h"
 
 #include "common/libs/fs/shared_fd.h"
-#include "host/vadb/vhci_instrument.h"
+#include "host/vadb/usbip/vhci_instrument.h"
 
 namespace vadb {
 namespace usbip {