commit d194b7120ce19bf8fd18b65be7851865b7d88e9c
author Torne (Richard Coles) <torne@google.com> Wed Oct 02 12:41:03 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Wed Oct 02 12:41:03 2013 +0100
tree 8ec7fd160da63434c3467634aa57235228813d41
parent c650367537c511ee507c7edeaee418bfa94e6ac7
parent 5691c0182f02e97ca9369fd8962a375cff24e876

Merge from Chromium at DEPS revision 30.0.1599.85

This commit was generated by merge_to_master.py.

Change-Id: I449d60b3d7547648d4a6871c352653a8a17d57b5

tests.gyp

diff --git a/tests.gyp b/tests.gyp
index 916f3e2..0a53617 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -34,7 +34,7 @@
         '../tests/BlitRowTest.cpp',
         '../tests/BlurTest.cpp',
         '../tests/CanvasTest.cpp',
-        '../tests/CanvasStateTest.cpp',
+#       '../tests/CanvasStateTest.cpp',
         '../tests/ChecksumTest.cpp',
         '../tests/ClampRangeTest.cpp',
         '../tests/ClipCacheTest.cpp',