tree 231dde76f42fc612104578e9f9d1dc28c84ffca2
parent a07326a91571ea118e4506d85b4ff3ae643ca142
parent 3b43460703114a86d5abde272dd36014e7b0e98d
author Colin Cross <ccross@android.com> 1429560590 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1429560591 +0000

Merge "Fix windows adb build"