commit | ae52bfb75248618609ad9dff836ca6c38f64f676 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Mon Nov 02 19:01:53 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 02 19:01:53 2015 +0000 |
tree | edca52c236ab8aa9e75e3cbc661ae2dbc2532677 | |
parent | 60c545050d68ec6a82903ab4557a8088422afee6 [diff] | |
parent | dcaf6932fde9df11f415f683589f962858084cb1 [diff] |
Merge "adb: use correct _WIN32 macro." am: 5c75b529f6 am: dcaf6932fd * commit 'dcaf6932fde9df11f415f683589f962858084cb1': adb: use correct _WIN32 macro.