Merge commit 'android-4.0.4_r1.1' into ics-x86

Conflicts:
	res/values-zu/arrays.xml

diff --cc res/values-es-rUS/arrays.xml
Simple merge

diff --cc res/values-pl/arrays.xml
Simple merge

diff --cc res/values-pt/arrays.xml
Simple merge

diff --cc res/values-ru/arrays.xml
Simple merge

diff --cc res/values-sl/arrays.xml
Simple merge

diff --cc res/values-zu/arrays.xml
index 9ca27fe,3669232..12de184
--- 1/res/values-zu/arrays.xml
--- 2/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@@ -33,10 -33,10 +33,10 @@@
      <item msgid="3342301044271143016">"amasekhondi angu-15"</item>
      <item msgid="8881760709354815449">"amasekhondi angu-30"</item>
      <item msgid="7589406073232279088">"1 iminithi"</item>
-     <item msgid="7001195990902244174">"amaminithi angu-2"</item>
+     <item msgid="7001195990902244174">"2 amaminithi"</item>
      <item msgid="7489864775127957179">"amaminithii angu-5"</item>
-     <item msgid="2314124409517439288">"amaminithi angu-10"</item>
+     <item msgid="2314124409517439288">"10 amaminithi"</item>
 -    <item msgid="6864027152847611413">"30 amaminithi"</item>
 +    <item msgid="6864027152847611413">"Ayiphelelwa isikhathi"</item>
    </string-array>
    <string-array name="dream_timeout_entries">
      <item msgid="3149294732238283185">"Akusoze"</item>