tree ffdfb6fa3c735d352a035cd5b91229e3e06237be
parent 8f66efbffe60943d712136f3a1cc71b487d38a53
parent 20dca26f41ef1b9097c2e7112cb641f21e6806f4
author Jerry Zhang <zhangjerry@google.com> 1531861155 -0700
committer android-build-merger <android-build-merger@google.com> 1531861155 -0700

Merge "UsbDescriptor: Add finite timeout to control transfer"
am: 20dca26f41

Change-Id: I86a916694a497bedb7d2df8a64dd17e0e15ce332