tree a09d4b9339a7828b73695add59ca8739d8e7dad0
parent 650a06e01bb3bf80a4223fcb9117f59fdcff4eb5
parent 76aefd5f9b46b9abe0a24bcac105a081b2a9a23a
author Elliott Hughes <enh@google.com> 1447433175 +0000
committer android-build-merger <android-build-merger@google.com> 1447433175 +0000

Merge "adb: win32: Unicode USB device names"
am: 76aefd5f9b

* commit '76aefd5f9b46b9abe0a24bcac105a081b2a9a23a':
  adb: win32: Unicode USB device names