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:
8f66efb
20dca26
)
Merge "UsbDescriptor: Add finite timeout to control transfer"
author
Jerry Zhang
<zhangjerry@google.com>
Tue, 17 Jul 2018 20:59:15 +0000
(13:59 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 17 Jul 2018 20:59:15 +0000
(13:59 -0700)
am:
20dca26f41
Change-Id: I86a916694a497bedb7d2df8a64dd17e0e15ce332
1
2
services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java
Simple merge