Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2a67840c: Fix a bad merge.

Browse Source 
* commit '2a67840c3c35a6267663e5d3ae921ee9ac614db9':
  Fix a bad merge.
This commit is contained in:
Jeff Brown
2015-07-09 20:47:34 +00:00
committed by Android Git Automerger
parent 2ad03d0c32 2a67840c3c
commit 8a5252fb46
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/usb/java/com/android/server/usb/UsbService.java
View File

@@ -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;