diff options
| author | Hal Canary <halcanary@google.com> | 2018-06-14 06:17:01 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-14 06:17:01 -0700 |
| commit | 58018a34180666e783bb805db1ce262946ff145d (patch) | |
| tree | a78b078034f12382b48ba8075bfec46f485ce438 | |
| parent | 5ecd2fa43a4a8b3e561dcfd0f9088fbc6d9b743e (diff) | |
| parent | 262f6424999ebd09431baba02ac2dc436166bec8 (diff) | |
| download | skqp-temp_p_merge.tar.gz | |
Merge remote-tracking branch remotes/aosp/upstream-skqp/release into aosp/mastertemp_p_merge
am: 262f642499
Change-Id: I4dc1f79c80785b1f4ce77e8d1daea6c6bb6d2349
| -rw-r--r-- | platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGpuUnitTests.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGpuUnitTests.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGpuUnitTests.txt index 6109a76e6a..db7b8d39da 100644 --- a/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGpuUnitTests.txt +++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGpuUnitTests.txt @@ -64,7 +64,6 @@ ImagePeek_Gpu ImageReadPixels_Gpu ImageScalePixels_Gpu InitialTextureClear -IntTexture LazyProxyReleaseTest LazyProxyTest OnFlushCallbackTest |