tree c6ef8c0adc0eddda4db153c0f51ff8a83c03f342
parent 14c08745ac3ff46330b545354664ffd3c8f60844
parent 6b940e1349da720bdba4c5eeb9741e5fffe30913
author Elliott Hughes <enh@google.com> 1438637295 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438637295 +0000

am 6b940e13: Merge "adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc"

* commit '6b940e1349da720bdba4c5eeb9741e5fffe30913':
  adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc