tree 90bd9d75b0239806097e4dab4ecf07bdd0ff61c9
parent d0645bf0cc76ef7be11cf77a8e1995233a1972e4
parent a8c7404956b4370162a87ae09b851266a4933b54
author Werner Johansson <werner.johansson@sonyericsson.com> 1277959939 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277959939 -0700

am a8c74049: am 931bdcc0: Set explicit timeout on USB control transfer

Merge commit 'a8c7404956b4370162a87ae09b851266a4933b54'

* commit 'a8c7404956b4370162a87ae09b851266a4933b54':
  Set explicit timeout on USB control transfer