Merge "Refactor DynamicIndexableContentMonitor"
diff --git a/Android.mk b/Android.mk
index d29de83..349b79c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,7 +45,7 @@
LOCAL_JACK_FLAGS := --multi-dex native
endif
-include frameworks/opt/setupwizard/library/common-full-support.mk
+include frameworks/opt/setupwizard/library/common-gingerbread.mk
include frameworks/base/packages/SettingsLib/common.mk
include $(BUILD_PACKAGE)
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c1a76b3..dd89e71 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -181,7 +181,7 @@
translation_description="Text in sample text used to illustrate how the currently selected font size will appear to the user. NOTE: Translate manually. No not adopt any copyrighted material for translation.">
Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City.
The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds.
- They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brighness of the sun.
+ They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun.
The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green.
\n\nThere were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins.
They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them.