OSDN Git Service

Merge "UsbDescriptor: Add finite timeout to control transfer"
authorJerry Zhang <zhangjerry@google.com>
Tue, 17 Jul 2018 20:59:15 +0000 (13:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jul 2018 20:59:15 +0000 (13:59 -0700)
commit4bff76be8058a0c2948836b4fd01b35bb57e9f86
treeffdfb6fa3c735d352a035cd5b91229e3e06237be
parent8f66efbffe60943d712136f3a1cc71b487d38a53
parent20dca26f41ef1b9097c2e7112cb641f21e6806f4
Merge "UsbDescriptor: Add finite timeout to control transfer"
am: 20dca26f41

Change-Id: I86a916694a497bedb7d2df8a64dd17e0e15ce332
services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java