commit 3d8ef153f27572944d1302820ad563b45091438e
author Mike Klein <mtklein@google.com> Mon Dec 10 07:59:01 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 10 13:59:15 2018 +0000
tree f0eb8a1f312e13fc03d0095f9bb536030c620093
parent 42ec7d774b90aacbf5379e63b61e0c09a2e03c43

roll up to "msvc != x86"

Change-Id: Id77714823235b0e1d2136171605f1b904469cf98
Reviewed-on: https://skia-review.googlesource.com/c/175980
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

DEPS

diff --git a/DEPS b/DEPS
index cc25ed7..afcd04b 100644
--- a/DEPS
+++ b/DEPS
@@ -32,7 +32,7 @@
   "third_party/externals/swiftshader"     : "https://swiftshader.googlesource.com/SwiftShader@2661e840833165f119862f3a43bc15743ce82cd5",
   #"third_party/externals/v8"              : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
   "third_party/externals/wuffs"           : "https://github.com/google/wuffs.git@b5c47e273f7f8862bcf04976453d0ec81e6e6650",
-  "third_party/externals/zlib"            : "https://chromium.googlesource.com/chromium/src/third_party/zlib@ea3ba903faac98b64b2bf8de5e98cd97b335a474",
+  "third_party/externals/zlib"            : "https://chromium.googlesource.com/chromium/src/third_party/zlib@47af7c547f8551bd25424e56354a2ae1e9062859",
   "third_party/externals/Nima-Cpp"      : "https://github.com/2d-inc/Nima-Cpp.git@4bd02269d7d1d2e650950411325eafa15defb084",
   "third_party/externals/Nima-Math-Cpp" : "https://github.com/2d-inc/Nima-Math-Cpp.git@e0c12772093fa8860f55358274515b86885f0108",