Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe82ef58 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA... 

am 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1

* commit '34260ad7':
  docs: fix locale name; South Africa is local en_ZA external issue 23133
parents b54d00a5 34260ad7

docs/html/sdk/android-2.3.3.jd

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ descriptor).</p> 
<li>English, New Zealand (en_NZ)</li>

<li>English, Singapore(en_SG)</li>

<li>English, US (en_US)</li>

<li>English, Zimbabwe (en_ZA)</li>

<li>English, South Africa (en_ZA)</li>

<li>Spanish (es_ES)</li>

<li>Spanish, US (es_US)</li>

<li>Finnish, Finland (fi_FI)</li>

docs/html/sdk/android-2.3.4.jd

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ descriptor).</p> 
<li>English, New Zealand (en_NZ)</li>

<li>English, Singapore(en_SG)</li>

<li>English, US (en_US)</li>

<li>English, Zimbabwe (en_ZA)</li>

<li>English, South Africa (en_ZA)</li>

<li>Spanish (es_ES)</li>

<li>Spanish, US (es_US)</li>

<li>Finnish, Finland (fi_FI)</li>

docs/html/sdk/android-2.3.jd

+1 −1
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ descriptor).</p> 
<li>English, New Zealand (en_NZ)</li>

<li>English, Singapore(en_SG)</li>

<li>English, US (en_US)</li>

<li>English, Zimbabwe (en_ZA)</li>

<li>English, South Africa (en_ZA)</li>

<li>Spanish (es_ES)</li>

<li>Spanish, US (es_US)</li>

<li>Finnish, Finland (fi_FI)</li>

docs/html/sdk/android-3.0.jd

+1 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ descriptor).</p> 
<li>English, New Zealand (en_NZ)</li>

<li>English, Singapore(en_SG)</li>

<li>English, US (en_US)</li>

<li>English, Zimbabwe (en_ZA)</li>

<li>English, South Africa (en_ZA)</li>

<li>Spanish (es_ES)</li>

<li>Spanish, US (es_US)</li>

<li>Finnish, Finland (fi_FI)</li>

docs/html/sdk/android-3.1.jd

+1 −1
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ descriptor).</p> 
<li>English, New Zealand (en_NZ)</li>

<li>English, Singapore(en_SG)</li>

<li>English, US (en_US)</li>

<li>English, Zimbabwe (en_ZA)</li>

<li>English, South Africa (en_ZA)</li>

<li>Spanish (es_ES)</li>

<li>Spanish, US (es_US)</li>

<li>Finnish, Finland (fi_FI)</li>