OSDN Git Service

Merge "UsbDescriptor: Add finite timeout to control transfer" am: 20dca26f41
authorJerry Zhang <zhangjerry@google.com>
Tue, 17 Jul 2018 22:00:31 +0000 (15:00 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jul 2018 22:00:31 +0000 (15:00 -0700)
am: 4bff76be80

Change-Id: Ie89d8a02c4e92e4d7d2372fad29abdba0c2fc568


Trivial merge