summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-03-01 11:58:22 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-01 11:58:22 -0800
commit04e1a9620f94319c455c9422776adb4a8963f920 (patch)
treee01ddd770061dc1917ef7365f9743f9a0ff29cf9 /core/java/android/app
parent42b3de5833c737c8ec16babeb1f254baf623abfc (diff)
parentc4308f01c965571dc2354107c3574df113e397ee (diff)
downloadframeworks_base-04e1a9620f94319c455c9422776adb4a8963f920.zip
frameworks_base-04e1a9620f94319c455c9422776adb4a8963f920.tar.gz
frameworks_base-04e1a9620f94319c455c9422776adb4a8963f920.tar.bz2
Merge "Move USB framework support from android.hardware to android.hardware.usb package"
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/ContextImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 8737e93..539e946 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -41,9 +41,9 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDatabase.CursorFactory;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
-import android.hardware.IUsbManager;
import android.hardware.SensorManager;
-import android.hardware.UsbManager;
+import android.hardware.usb.IUsbManager;
+import android.hardware.usb.UsbManager;
import android.location.CountryDetector;
import android.location.ICountryDetector;
import android.location.ILocationManager;