Merge change 23395 into eclair

* changes:
  When we get 304 and switch to cacheLoader, need to set mFromCache to be true. So that the cache loading will not create a new mCacheResult which overwrites the old cache data.

core/java/android/webkit/LoadListener.java

@@ -606,6 +606,7 @@ class LoadListener extends Handler implements EventHandler {
                 // before calling it.
                 if (mCacheLoader != null) {
                     mCacheLoader.load();
+                    mFromCache = true;
                     if (DebugFlags.LOAD_LISTENER) {
                         Log.v(LOGTAG, "LoadListener cache load url=" + url());
                     }