Auto merge of #21228 - jdm:syncupdate, r=jdm

Update sync commit.
This commit is contained in:
bors-servo 2018-07-22 12:16:50 -04:00 committed by GitHub
commit 4997ec26c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,2 +1,2 @@
local: 199471231478425b0de3c29b473764dabfe45cba
upstream: 320e4fd58a3bd93b844d9596e72027d5f3781f3d
local: a97d8b99efaa16a325b3a7bf2baf80ed2da2590d
upstream: 41185e560252a4701e3410081e9fffbc42c80eb7