OSDN Git Service

Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3fe...
authorJosh Gao <jmgao@google.com>
Wed, 30 Nov 2016 03:24:30 +0000 (03:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Nov 2016 03:24:30 +0000 (03:24 +0000)
am: 79517d4f9f

Change-Id: I8d7b80219e3292bbca47626f89c66c512a80abd2


Trivial merge