tree 6b06ceb66c9545f4707250fa8bf748fdb72e6103
parent d2445ea0b23a0065ff250e92bce8d346e76f06e8
parent aa19e7a2bbd3f503bcdbe4cca0944c4b696a63e9
author Josh Gao <jmgao@google.com> 1487970685 +0000
committer android-build-merger <android-build-merger@google.com> 1487970685 +0000

Merge "Statically link libwinpthread into windows binaries." am: 61d68b6152
am: aa19e7a2bb

Change-Id: I1f6ae14785d66e621ec8c07cc312655713e58436