diff options
| author | Paul McLean <pmclean@google.com> | 2014-05-15 21:02:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 21:02:49 +0000 |
| commit | c5d0cd895b55e994d095546afaadfba0917f4cdd (patch) | |
| tree | a28cc8046b2ff02924a46f414668d61e6b88aa55 /services | |
| parent | 1dfa9d98bee6326fe53240dbe7e1b05a75aba109 (diff) | |
| parent | 65a30ab519580deed21d206e66f456fc2c706fbe (diff) | |
| download | frameworks_base-c5d0cd895b55e994d095546afaadfba0917f4cdd.zip frameworks_base-c5d0cd895b55e994d095546afaadfba0917f4cdd.tar.gz frameworks_base-c5d0cd895b55e994d095546afaadfba0917f4cdd.tar.bz2 | |
Merge "Changed namespace of AlsaParser (and components) to correctly reflect their place in the directory hierarchy."
Diffstat (limited to 'services')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbHostManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbHostManager.java b/services/usb/java/com/android/server/usb/UsbHostManager.java index 8b54264..bcbae60 100644 --- a/services/usb/java/com/android/server/usb/UsbHostManager.java +++ b/services/usb/java/com/android/server/usb/UsbHostManager.java @@ -16,6 +16,8 @@ package com.android.server.usb; +import android.alsa.AlsaCardsParser; +import android.alsa.AlsaDevicesParser; import android.content.Context; import android.content.Intent; import android.hardware.usb.UsbConfiguration; @@ -29,8 +31,6 @@ import android.os.Parcelable; import android.os.UserHandle; import android.util.Slog; -import com.android.alsascan.AlsaCardsParser; -import com.android.alsascan.AlsaDevicesParser; import com.android.internal.annotations.GuardedBy; import java.io.File; |