Merge commit '75e05a5dbbbb75bb8e1b8f0fb3ff52c7baa8968d' * commit '75e05a5dbbbb75bb8e1b8f0fb3ff52c7baa8968d': When we get 304 and switch to cacheLoader, need to set mFromCache to be true.
Merge commit '75e05a5dbbbb75bb8e1b8f0fb3ff52c7baa8968d' * commit '75e05a5dbbbb75bb8e1b8f0fb3ff52c7baa8968d': When we get 304 and switch to cacheLoader, need to set mFromCache to be true.