Merge from master

Change-Id: I72b13c6443acdfb1b9ad477942f32a925fde5c61

1 files changed, 0 insertions, 3 deletions

diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
index 895963a57fb3..83c9c3d727f6 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -903,9 +903,6 @@ public class TestShellActivity extends Activity implements LayoutTestController
         settings.setWorkersEnabled(false);
         settings.setXSSAuditorEnabled(false);
         settings.setPageCacheCapacity(0);
-        // this enables cpu upload path (as opposed to gpu upload path)
-        // and it's only meant to be a temporary workaround!
-        settings.setProperty("enable_cpu_upload_path", "true");
         settings.setProperty("use_minimal_memory", "false");
     }