am 5e2a385c: Merge change 23395 into eclair

Merge commit '5e2a385c0d95f4a99dd8c562c6d2d79aa8546030' into eclair-plus-aosp

* commit '5e2a385c0d95f4a99dd8c562c6d2d79aa8546030':
  When we get 304 and switch to cacheLoader, need to set mFromCache to be true.

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());
                     }