commit | ab48362d17d38285011e8836c53690ae67da1e53 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Fri Nov 18 01:18:50 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Nov 18 01:18:50 2016 +0000 |
tree | 53efafd597a26e516751f629c443584df353cac7 | |
parent | 650e22d950a829ab6b80e0e9789c5283716f7326 [diff] | |
parent | 49c947166271585603970c3d26d0b3922cbc04e0 [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 am: fc1a1dfd3c am: a142c2415d Change-Id: I786b9728e0e499170a52e980600cfaff71b79fc6