commit | eebcd096438fee1c41a3181cd4920a322fba8a83 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Wed Nov 30 03:24:30 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Nov 30 03:24:30 2016 +0000 |
tree | 00081112a9bca9e9ecbe29cf46530819cb9ce079 | |
parent | eea8000047f8c14d1a84cb458172755d436c12fa [diff] | |
parent | 54c4cf68c087aedef3f4fc804da07814828df938 [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: I8d7b80219e3292bbca47626f89c66c512a80abd2