commit | f69ff66c5f53b534e5b4024160410620f846ba75 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Thu Nov 17 23:12:22 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Nov 17 23:12:22 2016 +0000 |
tree | 7eb50f1740b05726d114eb0d18ccf5f47b075a1e | |
parent | c80cd472c70909c0175aad139ecbea7258c7bd08 [diff] | |
parent | 50dcfdf43a218962b8c3d4e2296f6cb3a3e8037e [diff] |
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a Change-Id: I705254b519ec3fbf9798500d525b1f74c63f8153