Merge change 5383

* changes:
  Oops, need to hide the new api.

core/java/android/webkit/CacheManager.java

@@ -108,6 +108,9 @@ public final class CacheManager {
             return expires;
         }
 
+        /**
+         * @hide Pending API council approval
+         */
         public String getExpiresString() {
             return expiresString;
         }