summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/pm
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2013-04-11 18:10:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-11 18:10:51 -0700
commitb735e1d426d65007011a3d915ea8e2cdd0002ecb (patch)
tree00f6dbcb2b32e4ebb443a8eadfbb4bc1d143c64b /core/java/android/content/pm
parent042a5b0a59bbae9884947169e0f35a860e69d125 (diff)
parent70d2c77320287d97fa2d90cc60f85e1706bffb1b (diff)
downloadframeworks_base-b735e1d426d65007011a3d915ea8e2cdd0002ecb.zip
frameworks_base-b735e1d426d65007011a3d915ea8e2cdd0002ecb.tar.gz
frameworks_base-b735e1d426d65007011a3d915ea8e2cdd0002ecb.tar.bz2
am 70d2c773: am f5c757c6: Merge "More fix for bug #8159072 Spinner widget should be RTL\'ized" into jb-mr2-dev
* commit '70d2c77320287d97fa2d90cc60f85e1706bffb1b': More fix for bug #8159072 Spinner widget should be RTL'ized
Diffstat (limited to 'core/java/android/content/pm')
-rw-r--r--core/java/android/content/pm/ActivityInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java
index 7ccae76..8154bca 100644
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -426,7 +426,7 @@ public class ActivityInfo extends ComponentInfo
* Bit in {@link #configChanges} that indicates that the activity
* can itself handle changes to the font scaling factor. Set from the
* {@link android.R.attr#configChanges} attribute. This is
- * not a core resource configutation, but a higher-level value, so its
+ * not a core resource configuration, but a higher-level value, so its
* constant starts at the high bits.
*/
public static final int CONFIG_FONT_SCALE = 0x40000000;