From 2a67840c3c35a6267663e5d3ae921ee9ac614db9 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Thu, 9 Jul 2015 13:36:26 -0700
Subject: [PATCH] Fix a bad merge.

Change-Id: Ib722459a25c189bb800eb85d48b80bdc91a2b7db
---
 services/usb/java/com/android/server/usb/UsbService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java
index d90ade871efac..c8b42262be676 100644
--- a/services/usb/java/com/android/server/usb/UsbService.java
+++ b/services/usb/java/com/android/server/usb/UsbService.java
@@ -30,6 +30,7 @@ import android.hardware.usb.UsbManager;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.util.Slog;
 import android.util.SparseArray;