commit f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75
author Andy Stadler Fri Apr 10 16:24:47 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri Apr 10 16:24:47 2009 -0700
tree 1dd68eeddbfa83d571a3544d6d2e25ba9be21b49
parent 1eb75a0b3770177c3f0d0c2e843f80fc34451ef5

AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778

core/java/android/content/res/Configuration.java

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;