Merge change I1d9b205f into eclair

* changes:
  Skip locale dependent libcore tests if required locales are not present.

diff --git a/libcore/regex/src/main/java/java/util/regex/Pattern.java b/libcore/regex/src/main/java/java/util/regex/Pattern.java
index 2853bbe..e3a1207 100644 (file)
--- a/libcore/regex/src/main/java/java/util/regex/Pattern.java
+++ b/libcore/regex/src/main/java/java/util/regex/Pattern.java
@@ -47,7 +47,7 @@ import com.ibm.icu4jni.regex.NativeRegEx;
  *     boolean b2 = Pattern.matches("Hello, A[a-z]*!", "Hello, Robot!");   // false
  * </pre>
  * <p/>
- * Please consult the <a href="package.html">package documentation</a> for an
+ * Please consult the <a href="package-descr.html">package documentation</a> for an
  * overview of the regular expression syntax used in this class as well as
  * Android-specific implementation details.
  *