| commit | fc1a1dfd3c91932081e4a1bc131fbdd49d245dd6 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Nov 18 00:57:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 18 00:57:30 2016 +0000 |
| tree | 1e1da9eda6ee6d0ae02ec0546c51c6b114df16e4 | |
| parent | 74af75724d6eee899e085982cc81b35d74b0f148 [diff] | |
| parent | 79517d4f9f196bfd11388583e970d5c710951561 [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 am: 7149e3e72a am: 058bae82ed am: 5751e3335d am: 79517d4f9f Change-Id: I78fe778bb69d3be0551e062602a3517ff0b3220a