commit | 8c10834ef44ac2d9426e0528d41822da11cde155 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Wed Nov 30 03:30:04 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Nov 30 03:30:04 2016 +0000 |
tree | 00081112a9bca9e9ecbe29cf46530819cb9ce079 | |
parent | 656a40d92c64bbe0f7171c31eddadf5354d46b37 [diff] | |
parent | eebcd096438fee1c41a3181cd4920a322fba8a83 [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: effc9de94a Change-Id: Idd627ca6b4f73f0141a26b0024cb218ea3bec7c5