[tor-commits] [tor-android-service/master] Merge remote-tracking branch 'acatgh/40004'

[sysrqb at torproject.org]

commit 900054eacd0706a0c8df96bf96c7b3c1704b854a
Merge: 8213c8d f0537e9
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Tue Oct 20 23:01:25 2020 +0000

    Merge remote-tracking branch 'acatgh/40004'

 service/src/main/res/values-ar/strings.xml     | 1 -
 service/src/main/res/values-az/strings.xml     | 1 -
 service/src/main/res/values-bg/strings.xml     | 1 -
 service/src/main/res/values-bn-rBD/strings.xml | 1 -
 service/src/main/res/values-ca/strings.xml     | 1 -
 service/src/main/res/values-cs-rCZ/strings.xml | 1 -
 service/src/main/res/values-cs/strings.xml     | 1 -
 service/src/main/res/values-cy/strings.xml     | 1 -
 service/src/main/res/values-da/strings.xml     | 1 -
 service/src/main/res/values-de/strings.xml     | 1 -
 service/src/main/res/values-el/strings.xml     | 1 -
 service/src/main/res/values-eo/strings.xml     | 1 -
 service/src/main/res/values-es-rAR/strings.xml | 1 -
 service/src/main/res/values-es/strings.xml     | 1 -
 service/src/main/res/values-et/strings.xml     | 1 -
 service/src/main/res/values-eu/strings.xml     | 1 -
 service/src/main/res/values-fa/strings.xml     | 1 -
 service/src/main/res/values-fi/strings.xml     | 1 -
 service/src/main/res/values-fr-rFR/strings.xml | 1 -
 service/src/main/res/values-fr/strings.xml     | 1 -
 service/src/main/res/values-gl/strings.xml     | 1 -
 service/src/main/res/values-he/strings.xml     | 1 -
 service/src/main/res/values-hi/strings.xml     | 1 -
 service/src/main/res/values-hr/strings.xml     | 1 -
 service/src/main/res/values-hu/strings.xml     | 1 -
 service/src/main/res/values-id/strings.xml     | 1 -
 service/src/main/res/values-in-rID/strings.xml | 1 -
 service/src/main/res/values-in/strings.xml     | 1 -
 service/src/main/res/values-is/strings.xml     | 1 -
 service/src/main/res/values-it/strings.xml     | 1 -
 service/src/main/res/values-iw/strings.xml     | 1 -
 service/src/main/res/values-ja/strings.xml     | 1 -
 service/src/main/res/values-ko/strings.xml     | 1 -
 service/src/main/res/values-lv/strings.xml     | 1 -
 service/src/main/res/values-mk/strings.xml     | 1 -
 service/src/main/res/values-ms-rMY/strings.xml | 1 -
 service/src/main/res/values-ms/strings.xml     | 1 -
 service/src/main/res/values-nb/strings.xml     | 1 -
 service/src/main/res/values-nl/strings.xml     | 1 -
 service/src/main/res/values-pl/strings.xml     | 1 -
 service/src/main/res/values-pt-rBR/strings.xml | 1 -
 service/src/main/res/values-pt-rPT/strings.xml | 1 -
 service/src/main/res/values-pt/strings.xml     | 1 -
 service/src/main/res/values-ro/strings.xml     | 1 -
 service/src/main/res/values-rs-rAR/strings.xml | 1 -
 service/src/main/res/values-ru/strings.xml     | 1 -
 service/src/main/res/values-si-rLK/strings.xml | 1 -
 service/src/main/res/values-sk/strings.xml     | 1 -
 service/src/main/res/values-sl/strings.xml     | 1 -
 service/src/main/res/values-sn/strings.xml     | 1 -
 service/src/main/res/values-sr/strings.xml     | 1 -
 service/src/main/res/values-sv/strings.xml     | 1 -
 service/src/main/res/values-ta/strings.xml     | 1 -
 service/src/main/res/values-th/strings.xml     | 1 -
 service/src/main/res/values-tl/strings.xml     | 1 -
 service/src/main/res/values-tr/strings.xml     | 1 -
 service/src/main/res/values-uk/strings.xml     | 1 -
 service/src/main/res/values-uz/strings.xml     | 1 -
 service/src/main/res/values-vi/strings.xml     | 1 -
 service/src/main/res/values-zh-rCN/strings.xml | 1 -
 service/src/main/res/values-zh-rTW/strings.xml | 1 -
 service/src/main/res/values/strings.xml        | 2 +-
 62 files changed, 1 insertion(+), 62 deletions(-)