OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
55b8ddc
13c8399
)
am 13c83996: am 1c532c2e: am 4b07b26e: Merge "Make UsbService optional" into klp...
author
Adam Lesinski
<adamlesinski@google.com>
Wed, 19 Feb 2014 19:48:05 +0000
(19:48 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 19 Feb 2014 19:48:05 +0000
(19:48 +0000)
* commit '
13c839962e246517a7a95326610ea30c529d79dc
':
Make UsbService optional
1
2
services/java/com/android/server/SystemServer.java
patch
|
diff1
|
diff2
|
blob
|
history
services/usb/java/com/android/server/usb/UsbDeviceManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/SystemServer.java
Simple merge
diff --cc
services/usb/java/com/android/server/usb/UsbDeviceManager.java
Simple merge