am 910363bd: Merge change Ib5dc3f1f into eclair
Merge commit '910363bd8d50c2a5558a71e47377928265c1219e' into eclair-plus-aosp
* commit '910363bd8d50c2a5558a71e47377928265c1219e':
Fixing a lame test that was relying on hashmap iteration order.
diff --git a/regex/src/main/java/java/util/regex/Pattern.java b/regex/src/main/java/java/util/regex/Pattern.java
index 2853bbe..2c71de1 100644
--- a/regex/src/main/java/java/util/regex/Pattern.java
+++ b/regex/src/main/java/java/util/regex/Pattern.java
@@ -47,7 +47,7 @@
* 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-summary.html">package documentation</a> for an
* overview of the regular expression syntax used in this class as well as
* Android-specific implementation details.
*
diff --git a/xml/src/main/native/org_apache_harmony_xml_ExpatParser.cpp b/xml/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
index 7149272..40a4116 100644
--- a/xml/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
+++ b/xml/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
@@ -479,7 +479,7 @@
* @returns index of the separator
*/
static int findSeparator(const char* s) {
- char* pointer = strchr(s, '|');
+ const char* pointer = strchr(s, '|');
return pointer == NULL ? -1 : pointer - s;
}