tree b37082d0049dcdb91f0feec17cf9ec25002e7b93
parent 7f05ea78dd63708c4c2b4dfe8eb3d9cec8f97255
parent 4bff76be8058a0c2948836b4fd01b35bb57e9f86
author Jerry Zhang <zhangjerry@google.com> 1531864831 -0700
committer android-build-merger <android-build-merger@google.com> 1531864831 -0700

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

Change-Id: Ie89d8a02c4e92e4d7d2372fad29abdba0c2fc568