Automated import from //branches/donutburger/...@140424,140424
diff --git a/core/java/android/webkit/ContentLoader.java b/core/java/android/webkit/ContentLoader.java
index fb01c8c..f6d7f69 100644
--- a/core/java/android/webkit/ContentLoader.java
+++ b/core/java/android/webkit/ContentLoader.java
@@ -105,6 +105,9 @@
         if (mContentType != null) {
             headers.setContentType("text/html");
         }
+        // override the cache-control header set by StreamLoader as content can
+        // change, we don't want WebKit to cache it
+        headers.setCacheControl("no-store, no-cache");
     }
 
     /**