diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-02 12:41:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-02 12:41:03 +0100 |
| commit | d194b7120ce19bf8fd18b65be7851865b7d88e9c (patch) | |
| tree | 8ec7fd160da63434c3467634aa57235228813d41 | |
| parent | c650367537c511ee507c7edeaee418bfa94e6ac7 (diff) | |
| parent | 5691c0182f02e97ca9369fd8962a375cff24e876 (diff) | |
| download | gyp-kitkat-cts-release.tar.gz | |
Merge from Chromium at DEPS revision 30.0.1599.85android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-dev
This commit was generated by merge_to_master.py.
Change-Id: I449d60b3d7547648d4a6871c352653a8a17d57b5
| -rw-r--r-- | tests.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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', |