AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index 7e4b7ac..956b15a 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -35,8 +35,9 @@
public Locale locale;
/**
- * Locale should persist on setting
- * @hide pending API council approval
+ * Locale should persist on setting. This is hidden because it is really
+ * questionable whether this is the right way to expose the functionality.
+ * @hide
*/
public boolean userSetLocale;
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index 1a963f6..e020462 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -756,7 +756,7 @@
/**
* Open a data stream for reading a raw resource. This can only be used
- * with resources whose value is the name of an asset files -- that is, it can be
+ * with resources whose value is the name of an asset file -- that is, it can be
* used to open drawable, sound, and raw resources; it will fail on string
* and color resources.
*
@@ -766,8 +766,6 @@
* @return InputStream Access to the resource data.
*
* @throws NotFoundException Throws NotFoundException if the given ID does not exist.
- *
- * @hide Pending API council approval
*/
public InputStream openRawResource(int id, TypedValue value) throws NotFoundException {
getValue(id, value, true);