From e1c7c1e94b137a0aaf6e31cbac43740ef0d85eb6 Mon Sep 17 00:00:00 2001
From: qingliu <shuiqingliu14@gmail.com>
Date: Fri, 24 May 2013 13:42:20 +0800
Subject: [PATCH] Update LegacyUsbDeviceManager.java

---
 .../java/com/android/server/usb/LegacyUsbDeviceManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/java/com/android/server/usb/LegacyUsbDeviceManager.java b/services/java/com/android/server/usb/LegacyUsbDeviceManager.java
index 4aa5e7fd8cf85..a518568c7e348 100644
--- a/services/java/com/android/server/usb/LegacyUsbDeviceManager.java
+++ b/services/java/com/android/server/usb/LegacyUsbDeviceManager.java
@@ -107,10 +107,10 @@ public class LegacyUsbDeviceManager extends UsbDeviceManager {
     private boolean mUseUsbNotification;
     private boolean mAdbEnabled;
     private boolean mLegacy = false;
-<<<<<<< HEAD
+
     private boolean mHasUsbService = false;
-=======
->>>>>>> cyanogen/cm-10.1
+
+
     private UsbDebuggingManager mDebuggingManager;
 
     private class AdbSettingsObserver extends ContentObserver {