summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/pm
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2013-04-11 18:07:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-11 18:07:06 -0700
commit70d2c77320287d97fa2d90cc60f85e1706bffb1b (patch)
tree4d3d11364075302dba5f00dc1ecd32642e3be97a /core/java/android/content/pm
parentbc708d8b9d8ac4d1a9a02c3d547364364114ddad (diff)
parentf5c757c6292fb2623757ef73020d3730ead063d7 (diff)
downloadframeworks_base-70d2c77320287d97fa2d90cc60f85e1706bffb1b.zip
frameworks_base-70d2c77320287d97fa2d90cc60f85e1706bffb1b.tar.gz
frameworks_base-70d2c77320287d97fa2d90cc60f85e1706bffb1b.tar.bz2
am f5c757c6: Merge "More fix for bug #8159072 Spinner widget should be RTL\'ized" into jb-mr2-dev
* commit 'f5c757c6292fb2623757ef73020d3730ead063d7': 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;