commit 314f9503a99e86c5036398cf19f577785ed88de3
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 13 19:41:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 13 19:41:21 2018 +0000
tree f746426b44b992cb3acc3aed3943f6331b2e74df
parent a85e213544aa7fa1a471fdc5ea315fe286dbe4e2
parent 0534690fa6513e59bf2fc0fe13b91be8b4db05b4

Merge "Make safeunion@1.0 test HAL Java-compatible"

usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp

diff --git a/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp b/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp
index c990b23..caf9c69 100644
--- a/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp
+++ b/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp
@@ -31,8 +31,8 @@
 #include <condition_variable>
 #include <mutex>
 
+using ::android::hardware::usb::V1_1::IUsb;
 using ::android::hardware::usb::V1_1::IUsbCallback;
-using ::android::hardware::usb::V1_0::IUsb;
 using ::android::hardware::usb::V1_0::PortDataRole;
 using ::android::hardware::usb::V1_0::PortMode;
 using ::android::hardware::usb::V1_1::PortMode_1_1;