resolve merge conflicts of 94ab88228e to master.

NB: packages/apps/Settings/res/values/arrays.xml new content
moves to frameworks/base/packages/SettingsLib/res/values/arrays.xml.

Bug: 26178938
Change-Id: Ib241baac7807914447d84b921994440bf627df29

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

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

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

diff --cc res/values-az-rAZ/arrays.xml
index cd63310,a319830..ac570d2
--- 1/res/values-az-rAZ/arrays.xml
--- 2/res/values-az-rAZ/arrays.xml
+++ b/res/values-az-rAZ/arrays.xml
@@@ -384,14 -316,24 +384,15 @@@
      <item msgid="8342334626783983353">"100%"</item>
    </string-array>
    <string-array name="captioning_preset_selector_titles">
 -    <item msgid="1630625150404038035">"Qara üstündə ağ"</item>
 -    <item msgid="4589278788192525675">"Ağ üstündə qara"</item>
 -    <item msgid="1309255027325660115">"Qara üstündə sarı"</item>
 -    <item msgid="2985943780939258562">"Mavi üstündə sarı"</item>
 -    <item msgid="7520438652121629055">"Fərdi"</item>
 -  </string-array>
 -  <string-array name="select_runtime_titles">
 -    <item msgid="3574453009229338122">"Dalvik"</item>
 -    <item msgid="8978402910750533864">"ART"</item>
 -    <item msgid="7839859333977894115">"ART (sazlama)"</item>
 -  </string-array>
 -  <string-array name="select_runtime_summaries">
 -    <item msgid="6412880178297884701">"Dalvik istifadə edin"</item>
 -    <item msgid="5131846588686178907">"ART istifadə edin"</item>
 -    <item msgid="4530003713865319928">"ART sazlama tərtibatından istifadə edin"</item>
 +    <item msgid="7009918361545506251">"Tətbiq defoltlarını istifadə edin"</item>
 +    <item msgid="1770533843436933500">"Qara üstündə ağ"</item>
 +    <item msgid="758587126802411846">"Ağ üstündə qara"</item>
 +    <item msgid="1495307195241623402">"Qara üstündə sarı"</item>
 +    <item msgid="6039700130994371612">"Mavi üstündə sarı"</item>
 +    <item msgid="7169235156349580064">"Fərd"</item>
    </string-array>
    <string-array name="select_logd_size_titles">
+     <item msgid="4663095428454779138">"Qapalı"</item>
      <item msgid="3100534874529240291">"64K"</item>
      <item msgid="505611754508988476">"256K"</item>
      <item msgid="6361286924268716397">"1M"</item>

diff --cc res/values-bg/arrays.xml
index c48e7b3,d0251bd..54507aa
--- 1/res/values-bg/arrays.xml
--- 2/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@@ -389,9 -388,10 +389,10 @@@
      <item msgid="758587126802411846">"Черно върху бяло"</item>
      <item msgid="1495307195241623402">"Жълто върху черно"</item>
      <item msgid="6039700130994371612">"Жълто върху синьо"</item>
 -    <item msgid="7169235156349580064">"Персонализирано"</item>
 +    <item msgid="7169235156349580064">"Персонализиран"</item>
    </string-array>
    <string-array name="select_logd_size_titles">
+     <item msgid="4663095428454779138">"Изключено"</item>
      <item msgid="3100534874529240291">"64 КБ"</item>
      <item msgid="505611754508988476">"256 КБ"</item>
      <item msgid="6361286924268716397">"1 МБ"</item>

diff --cc res/values-bn-rBD/arrays.xml
Simple merge

diff --cc res/values-ca/arrays.xml
index 940dd08,2a0432d..f923294
--- 1/res/values-ca/arrays.xml
--- 2/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@@ -404,11 -405,12 +406,12 @@@
      <item msgid="8085867209202153403">"1.000.000"</item>
    </string-array>
    <string-array name="select_logd_size_summaries">
 -    <item msgid="7346595473588765019">"64 K/memòria cau reg."</item>
 -    <item msgid="2822309747675758628">"256 K/memòria cau reg."</item>
 -    <item msgid="6699306198357496731">"1 M/memòria cau reg."</item>
 -    <item msgid="5748528643937500349">"4 M/memòria cau reg."</item>
 -    <item msgid="1978629051085111592">"16 M/memòria cau reg."</item>
+     <item msgid="4663095428454779138">"Desactivat"</item>
 +    <item msgid="7346595473588765019">"64 K/memòria intermèdia reg."</item>
 +    <item msgid="2822309747675758628">"256 K/memòria intermèdia reg."</item>
 +    <item msgid="6699306198357496731">"1 M/memòria intermèdia reg."</item>
 +    <item msgid="5748528643937500349">"4 M/memòria intermèdia reg."</item>
 +    <item msgid="1978629051085111592">"16 M/memòria intermèdia reg."</item>
    </string-array>
    <string-array name="hdcp_checking_titles">
      <item msgid="441827799230089869">"No comprovis mai"</item>

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

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

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

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

diff --cc res/values-en-rAU/arrays.xml
Simple merge

diff --cc res/values-en-rGB/arrays.xml
Simple merge

diff --cc res/values-en-rIN/arrays.xml
Simple merge

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

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

diff --cc res/values-et-rEE/arrays.xml
Simple merge

diff --cc res/values-eu-rES/arrays.xml
Simple merge

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

diff --cc res/values-fi/arrays.xml
index 9e5994d,12cb877..5b70148
--- 1/res/values-fi/arrays.xml
--- 2/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@@ -404,8 -405,9 +406,9 @@@
      <item msgid="8085867209202153403">"1 Mt"</item>
    </string-array>
    <string-array name="select_logd_size_summaries">
+     <item msgid="4663095428454779138">"Pois käytöstä"</item>
      <item msgid="7346595473588765019">"64 kt / lokipuskuri"</item>
 -    <item msgid="2822309747675758628">"256 kt / lokipusk."</item>
 +    <item msgid="2822309747675758628">"256 kt / lokipuskuri"</item>
      <item msgid="6699306198357496731">"1 Mt / lokipuskuri"</item>
      <item msgid="5748528643937500349">"4 Mt / lokipuskuri"</item>
      <item msgid="1978629051085111592">"16 Mt / lokipuskuri"</item>

diff --cc res/values-fr-rCA/arrays.xml
Simple merge

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

diff --cc res/values-gl-rES/arrays.xml
Simple merge

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

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

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

diff --cc res/values-hy-rAM/arrays.xml
Simple merge

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

diff --cc res/values-is-rIS/arrays.xml
Simple merge

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

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

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

diff --cc res/values-ka-rGE/arrays.xml
Simple merge

diff --cc res/values-kk-rKZ/arrays.xml
index bfe1d3e,b09d3c2..a483a34
--- 1/res/values-kk-rKZ/arrays.xml
--- 2/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk-rKZ/arrays.xml
@@@ -389,9 -388,10 +389,10 @@@
      <item msgid="758587126802411846">"Ақ түсте қарамен"</item>
      <item msgid="1495307195241623402">"Қара түсте сарымен"</item>
      <item msgid="6039700130994371612">"Көк түсте сарымен"</item>
 -    <item msgid="7169235156349580064">"ТеңÑ\88елетін"</item>
 +    <item msgid="7169235156349580064">"РеÑ\82Ñ\82елетін"</item>
    </string-array>
    <string-array name="select_logd_size_titles">
+     <item msgid="4663095428454779138">"Өшірулі"</item>
      <item msgid="3100534874529240291">"64 КБ"</item>
      <item msgid="505611754508988476">"256 КБ"</item>
      <item msgid="6361286924268716397">"1 МБ"</item>

diff --cc res/values-km-rKH/arrays.xml
Simple merge

diff --cc res/values-kn-rIN/arrays.xml
Simple merge

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

diff --cc res/values-ky-rKG/arrays.xml
Simple merge

diff --cc res/values-lo-rLA/arrays.xml
Simple merge

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

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

diff --cc res/values-mk-rMK/arrays.xml
Simple merge

diff --cc res/values-ml-rIN/arrays.xml
Simple merge

diff --cc res/values-mn-rMN/arrays.xml
Simple merge

diff --cc res/values-mr-rIN/arrays.xml
Simple merge

diff --cc res/values-ms-rMY/arrays.xml
Simple merge

diff --cc res/values-my-rMM/arrays.xml
Simple merge

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

diff --cc res/values-ne-rNP/arrays.xml
Simple merge

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

diff --cc res/values-pa-rIN/arrays.xml
Simple merge

diff --cc res/values-pl/arrays.xml
index 704d41e,c324f7c..ba2998f
--- 1/res/values-pl/arrays.xml
--- 2/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@@ -392,23 -391,26 +392,26 @@@
      <item msgid="7169235156349580064">"Niestandardowy"</item>
    </string-array>
    <string-array name="select_logd_size_titles">
 -    <item msgid="3100534874529240291">"64 K"</item>
 -    <item msgid="505611754508988476">"256 K"</item>
 -    <item msgid="6361286924268716397">"1 M"</item>
 -    <item msgid="6405203239560695266">"4 M"</item>
 -    <item msgid="3025431211013424097">"16 M"</item>
+     <item msgid="4663095428454779138">"Wyłączona"</item>
 +    <item msgid="3100534874529240291">"64 KB"</item>
 +    <item msgid="505611754508988476">"256 KB"</item>
 +    <item msgid="6361286924268716397">"1 MB"</item>
 +    <item msgid="6405203239560695266">"4 MB"</item>
 +    <item msgid="3025431211013424097">"16 MB"</item>
    </string-array>
    <string-array name="select_logd_size_lowram_titles">
 -    <item msgid="524799395770610154">"64 K"</item>
 -    <item msgid="3534782711045262344">"256 K"</item>
 -    <item msgid="8085867209202153403">"1 M"</item>
+     <item msgid="4663095428454779138">"Wyłączona"</item>
 +    <item msgid="524799395770610154">"64 KB"</item>
 +    <item msgid="3534782711045262344">"256 KB"</item>
 +    <item msgid="8085867209202153403">"1 MB"</item>
    </string-array>
    <string-array name="select_logd_size_summaries">
 -    <item msgid="7346595473588765019">"64 K/bufor dziennika"</item>
 -    <item msgid="2822309747675758628">"256 K/bufor dziennika"</item>
 -    <item msgid="6699306198357496731">"1 M/bufor dziennika"</item>
 -    <item msgid="5748528643937500349">"4 M/bufor dziennika"</item>
 -    <item msgid="1978629051085111592">"16 M/bufor dziennika"</item>
+     <item msgid="4663095428454779138">"Wyłączona"</item>
 +    <item msgid="7346595473588765019">"64 KB/bufor dziennika"</item>
 +    <item msgid="2822309747675758628">"256 KB/bufor dziennika"</item>
 +    <item msgid="6699306198357496731">"1 MB/bufor dziennika"</item>
 +    <item msgid="5748528643937500349">"4 MB/bufor dziennika"</item>
 +    <item msgid="1978629051085111592">"16 MB/bufor dziennika"</item>
    </string-array>
    <string-array name="hdcp_checking_titles">
      <item msgid="441827799230089869">"Nigdy nie sprawdzaj"</item>

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

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

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

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

diff --cc res/values-si-rLK/arrays.xml
Simple merge

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

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

diff --cc res/values-sr/arrays.xml
index d291126,b7ec46e..09f3b40
--- 1/res/values-sr/arrays.xml
--- 2/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@@ -389,9 -388,10 +389,10 @@@
      <item msgid="758587126802411846">"Црно на бело"</item>
      <item msgid="1495307195241623402">"Жуто на црно"</item>
      <item msgid="6039700130994371612">"Жуто на плаво"</item>
 -    <item msgid="7169235156349580064">"Ð\9fÑ\80илагоÑ\92ена"</item>
 +    <item msgid="7169235156349580064">"Ð\9fÑ\80илагоÑ\92ено"</item>
    </string-array>
    <string-array name="select_logd_size_titles">
+     <item msgid="4663095428454779138">"Искључено"</item>
      <item msgid="3100534874529240291">"64 kB"</item>
      <item msgid="505611754508988476">"256 kB"</item>
      <item msgid="6361286924268716397">"1 MB"</item>

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

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

diff --cc res/values-ta-rIN/arrays.xml
Simple merge

diff --cc res/values-te-rIN/arrays.xml
Simple merge

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

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

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

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

diff --cc res/values-ur-rPK/arrays.xml
Simple merge

diff --cc res/values-uz-rUZ/arrays.xml
index eb68722,0356d28..5866092
--- 1/res/values-uz-rUZ/arrays.xml
--- 2/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml
@@@ -389,9 -388,10 +389,10 @@@
      <item msgid="758587126802411846">"Oq ustida qora"</item>
      <item msgid="1495307195241623402">"Qora ustida sariq"</item>
      <item msgid="6039700130994371612">"Ko‘k ustida sariq"</item>
 -    <item msgid="7169235156349580064">"Boshqa"</item>
 +    <item msgid="7169235156349580064">"Maxsus"</item>
    </string-array>
    <string-array name="select_logd_size_titles">
+     <item msgid="4663095428454779138">"O‘chiq"</item>
      <item msgid="3100534874529240291">"64 KB"</item>
      <item msgid="505611754508988476">"256 KB"</item>
      <item msgid="6361286924268716397">"1 MB"</item>

diff --cc res/values-vi/arrays.xml
index 8c8073b,9256093..b7909a8
--- 1/res/values-vi/arrays.xml
--- 2/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@@ -404,8 -405,9 +406,9 @@@
      <item msgid="8085867209202153403">"1M"</item>
    </string-array>
    <string-array name="select_logd_size_summaries">
+     <item msgid="4663095428454779138">"Tắt"</item>
      <item msgid="7346595473588765019">"64K/lần tải nhật ký"</item>
 -    <item msgid="2822309747675758628">"256K/lần tải n.ký"</item>
 +    <item msgid="2822309747675758628">"256K/lần tải nhật ký"</item>
      <item msgid="6699306198357496731">"1M/lần tải nhật ký"</item>
      <item msgid="5748528643937500349">"4M/lần tải nhật ký"</item>
      <item msgid="1978629051085111592">"16M/lần tải nhật ký"</item>

diff --cc res/values-zh-rCN/arrays.xml
Simple merge

diff --cc res/values-zh-rHK/arrays.xml
Simple merge

diff --cc res/values-zh-rTW/arrays.xml
Simple merge

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

diff --cc src/com/android/settings/DevelopmentSettings.java
Simple merge