tree 4e2fd13a3d4946141b650d92076bdb56a8c50451
parent be881b65ca0dcd0f267a767eaecb61636e089399
parent a54f14eb95d73c91aaa2a4387a79d897a4731060
author Elliott Hughes <enh@google.com> 1440792467 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440792467 +0000

am a54f14eb: Merge "adb unittest: get test_unicode_paths passing on win32"

* commit 'a54f14eb95d73c91aaa2a4387a79d897a4731060':
  adb unittest: get test_unicode_paths passing on win32