tree aa1c7327abf786302659e9ea76c2db58a475a5b3
parent 50740f56162807f9e88d36249e7d466d8ce5a282
parent 639cea4ae15afaaee1be9d484fa13aae08cd3a53
author Elliott Hughes <enh@google.com> 1442013220 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1442013220 +0000

Merge "fix adb_test Windows build"