| commit | 7149e3e72a8838d413fddb98a36e9a104d7b413c | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Thu Nov 17 23:57:54 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 17 23:57:54 2016 +0000 |
| tree | 34c27432788cf5407fbb727371b6a8f360ab059c | |
| parent | d1a97475892721064294d5bfdefac2098aca0287 [diff] | |
| parent | ffcd14a9b95695e0d90e4b3de779222c77eb5d82 [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 am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 Change-Id: I62537211751b865364bacaf8cf9c1d1596e76332