aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/res/values-az/strings.xml (renamed from common/res/values-az-rAZ/strings.xml)0
-rw-r--r--common/res/values-bn/strings.xml (renamed from common/res/values-bn-rBD/strings.xml)0
-rw-r--r--common/res/values-et/strings.xml (renamed from common/res/values-et-rEE/strings.xml)0
-rw-r--r--common/res/values-eu/strings.xml (renamed from common/res/values-eu-rES/strings.xml)0
-rw-r--r--common/res/values-gl/strings.xml (renamed from common/res/values-gl-rES/strings.xml)0
-rw-r--r--common/res/values-hy/strings.xml (renamed from common/res/values-hy-rAM/strings.xml)0
-rw-r--r--common/res/values-is/strings.xml (renamed from common/res/values-is-rIS/strings.xml)0
-rw-r--r--common/res/values-ka/strings.xml (renamed from common/res/values-ka-rGE/strings.xml)0
-rw-r--r--common/res/values-kk/strings.xml (renamed from common/res/values-kk-rKZ/strings.xml)0
-rw-r--r--common/res/values-km/strings.xml (renamed from common/res/values-km-rKH/strings.xml)0
-rw-r--r--common/res/values-kn/strings.xml (renamed from common/res/values-kn-rIN/strings.xml)0
-rw-r--r--common/res/values-ky/strings.xml (renamed from common/res/values-ky-rKG/strings.xml)0
-rw-r--r--common/res/values-lo/strings.xml (renamed from common/res/values-lo-rLA/strings.xml)0
-rw-r--r--common/res/values-mk/strings.xml (renamed from common/res/values-mk-rMK/strings.xml)0
-rw-r--r--common/res/values-ml/strings.xml (renamed from common/res/values-ml-rIN/strings.xml)0
-rw-r--r--common/res/values-mn/strings.xml (renamed from common/res/values-mn-rMN/strings.xml)0
-rw-r--r--common/res/values-mr/strings.xml (renamed from common/res/values-mr-rIN/strings.xml)0
-rw-r--r--common/res/values-ms/strings.xml (renamed from common/res/values-ms-rMY/strings.xml)0
-rw-r--r--common/res/values-my/strings.xml (renamed from common/res/values-my-rMM/strings.xml)0
-rw-r--r--common/res/values-ne/strings.xml (renamed from common/res/values-ne-rNP/strings.xml)0
-rw-r--r--common/res/values-si/strings.xml (renamed from common/res/values-si-rLK/strings.xml)0
-rw-r--r--common/res/values-ta/strings.xml (renamed from common/res/values-ta-rIN/strings.xml)0
-rw-r--r--common/res/values-te/strings.xml (renamed from common/res/values-te-rIN/strings.xml)0
-rw-r--r--common/res/values-ur/strings.xml (renamed from common/res/values-ur-rPK/strings.xml)0
-rw-r--r--common/res/values-uz/strings.xml (renamed from common/res/values-uz-rUZ/strings.xml)0
-rw-r--r--res/values-az/arrays.xml (renamed from res/values-az-rAZ/arrays.xml)0
-rw-r--r--res/values-az/rating_system_strings.xml (renamed from res/values-az-rAZ/rating_system_strings.xml)0
-rw-r--r--res/values-az/strings.xml (renamed from res/values-az-rAZ/strings.xml)0
-rw-r--r--res/values-bn-v23/strings.xml (renamed from res/values-bn-rBD-v23/strings.xml)0
-rw-r--r--res/values-bn/arrays.xml (renamed from res/values-bn-rBD/arrays.xml)0
-rw-r--r--res/values-bn/rating_system_strings.xml (renamed from res/values-bn-rBD/rating_system_strings.xml)0
-rw-r--r--res/values-bn/strings.xml (renamed from res/values-bn-rBD/strings.xml)0
-rw-r--r--res/values-et-v23/strings.xml (renamed from res/values-et-rEE-v23/strings.xml)0
-rw-r--r--res/values-et/arrays.xml (renamed from res/values-et-rEE/arrays.xml)0
-rw-r--r--res/values-et/rating_system_strings.xml (renamed from res/values-et-rEE/rating_system_strings.xml)0
-rw-r--r--res/values-et/strings.xml (renamed from res/values-et-rEE/strings.xml)0
-rw-r--r--res/values-eu-v23/strings.xml (renamed from res/values-eu-rES-v23/strings.xml)0
-rw-r--r--res/values-eu/arrays.xml (renamed from res/values-eu-rES/arrays.xml)0
-rw-r--r--res/values-eu/rating_system_strings.xml (renamed from res/values-eu-rES/rating_system_strings.xml)0
-rw-r--r--res/values-eu/strings.xml (renamed from res/values-eu-rES/strings.xml)0
-rw-r--r--res/values-gl-v23/strings.xml (renamed from res/values-gl-rES-v23/strings.xml)0
-rw-r--r--res/values-gl/arrays.xml (renamed from res/values-gl-rES/arrays.xml)0
-rw-r--r--res/values-gl/rating_system_strings.xml (renamed from res/values-gl-rES/rating_system_strings.xml)0
-rw-r--r--res/values-gl/strings.xml (renamed from res/values-gl-rES/strings.xml)0
-rw-r--r--res/values-hy-v23/strings.xml (renamed from res/values-hy-rAM-v23/strings.xml)0
-rw-r--r--res/values-hy/arrays.xml (renamed from res/values-hy-rAM/arrays.xml)0
-rw-r--r--res/values-hy/rating_system_strings.xml (renamed from res/values-hy-rAM/rating_system_strings.xml)0
-rw-r--r--res/values-hy/strings.xml (renamed from res/values-hy-rAM/strings.xml)0
-rw-r--r--res/values-is-v23/strings.xml (renamed from res/values-is-rIS-v23/strings.xml)0
-rw-r--r--res/values-is/arrays.xml (renamed from res/values-is-rIS/arrays.xml)0
-rw-r--r--res/values-is/rating_system_strings.xml (renamed from res/values-is-rIS/rating_system_strings.xml)0
-rw-r--r--res/values-is/strings.xml (renamed from res/values-is-rIS/strings.xml)0
-rw-r--r--res/values-ka-v23/strings.xml (renamed from res/values-ka-rGE-v23/strings.xml)0
-rw-r--r--res/values-ka/arrays.xml (renamed from res/values-ka-rGE/arrays.xml)0
-rw-r--r--res/values-ka/rating_system_strings.xml (renamed from res/values-ka-rGE/rating_system_strings.xml)0
-rw-r--r--res/values-ka/strings.xml (renamed from res/values-ka-rGE/strings.xml)0
-rw-r--r--res/values-kk-v23/strings.xml (renamed from res/values-kk-rKZ-v23/strings.xml)0
-rw-r--r--res/values-kk/arrays.xml (renamed from res/values-kk-rKZ/arrays.xml)0
-rw-r--r--res/values-kk/rating_system_strings.xml (renamed from res/values-kk-rKZ/rating_system_strings.xml)0
-rw-r--r--res/values-kk/strings.xml (renamed from res/values-kk-rKZ/strings.xml)0
-rw-r--r--res/values-km-v23/strings.xml (renamed from res/values-km-rKH-v23/strings.xml)0
-rw-r--r--res/values-km/arrays.xml (renamed from res/values-km-rKH/arrays.xml)0
-rw-r--r--res/values-km/rating_system_strings.xml (renamed from res/values-km-rKH/rating_system_strings.xml)0
-rw-r--r--res/values-km/strings.xml (renamed from res/values-km-rKH/strings.xml)0
-rw-r--r--res/values-kn-v23/strings.xml (renamed from res/values-kn-rIN-v23/strings.xml)0
-rw-r--r--res/values-kn/arrays.xml (renamed from res/values-kn-rIN/arrays.xml)0
-rw-r--r--res/values-kn/rating_system_strings.xml (renamed from res/values-kn-rIN/rating_system_strings.xml)0
-rw-r--r--res/values-kn/strings.xml (renamed from res/values-kn-rIN/strings.xml)0
-rw-r--r--res/values-ky-v23/strings.xml (renamed from res/values-ky-rKG-v23/strings.xml)0
-rw-r--r--res/values-ky/arrays.xml (renamed from res/values-ky-rKG/arrays.xml)0
-rw-r--r--res/values-ky/rating_system_strings.xml (renamed from res/values-ky-rKG/rating_system_strings.xml)0
-rw-r--r--res/values-ky/strings.xml (renamed from res/values-ky-rKG/strings.xml)0
-rw-r--r--res/values-lo-v23/strings.xml (renamed from res/values-lo-rLA-v23/strings.xml)0
-rw-r--r--res/values-lo/arrays.xml (renamed from res/values-lo-rLA/arrays.xml)0
-rw-r--r--res/values-lo/rating_system_strings.xml (renamed from res/values-lo-rLA/rating_system_strings.xml)0
-rw-r--r--res/values-lo/strings.xml (renamed from res/values-lo-rLA/strings.xml)0
-rw-r--r--res/values-mk-v23/strings.xml (renamed from res/values-mk-rMK-v23/strings.xml)0
-rw-r--r--res/values-mk/arrays.xml (renamed from res/values-mk-rMK/arrays.xml)0
-rw-r--r--res/values-mk/rating_system_strings.xml (renamed from res/values-mk-rMK/rating_system_strings.xml)0
-rw-r--r--res/values-mk/strings.xml (renamed from res/values-mk-rMK/strings.xml)0
-rw-r--r--res/values-ml-v23/strings.xml (renamed from res/values-ml-rIN-v23/strings.xml)0
-rw-r--r--res/values-ml/arrays.xml (renamed from res/values-ml-rIN/arrays.xml)0
-rw-r--r--res/values-ml/rating_system_strings.xml (renamed from res/values-ml-rIN/rating_system_strings.xml)0
-rw-r--r--res/values-ml/strings.xml (renamed from res/values-ml-rIN/strings.xml)0
-rw-r--r--res/values-mn-v23/strings.xml (renamed from res/values-mn-rMN-v23/strings.xml)0
-rw-r--r--res/values-mn/arrays.xml (renamed from res/values-mn-rMN/arrays.xml)0
-rw-r--r--res/values-mn/rating_system_strings.xml (renamed from res/values-mn-rMN/rating_system_strings.xml)0
-rw-r--r--res/values-mn/strings.xml (renamed from res/values-mn-rMN/strings.xml)0
-rw-r--r--res/values-mr-v23/strings.xml (renamed from res/values-mr-rIN-v23/strings.xml)0
-rw-r--r--res/values-mr/arrays.xml (renamed from res/values-mr-rIN/arrays.xml)0
-rw-r--r--res/values-mr/rating_system_strings.xml (renamed from res/values-mr-rIN/rating_system_strings.xml)0
-rw-r--r--res/values-mr/strings.xml (renamed from res/values-mr-rIN/strings.xml)0
-rw-r--r--res/values-ms-v23/strings.xml (renamed from res/values-ms-rMY-v23/strings.xml)0
-rw-r--r--res/values-ms/arrays.xml (renamed from res/values-ms-rMY/arrays.xml)0
-rw-r--r--res/values-ms/rating_system_strings.xml (renamed from res/values-ms-rMY/rating_system_strings.xml)0
-rw-r--r--res/values-ms/strings.xml (renamed from res/values-ms-rMY/strings.xml)0
-rw-r--r--res/values-my-v23/strings.xml (renamed from res/values-my-rMM-v23/strings.xml)0
-rw-r--r--res/values-my/arrays.xml (renamed from res/values-my-rMM/arrays.xml)0
-rw-r--r--res/values-my/rating_system_strings.xml (renamed from res/values-my-rMM/rating_system_strings.xml)0
-rw-r--r--res/values-my/strings.xml (renamed from res/values-my-rMM/strings.xml)0
-rw-r--r--res/values-ne-v23/strings.xml (renamed from res/values-ne-rNP-v23/strings.xml)0
-rw-r--r--res/values-ne/arrays.xml (renamed from res/values-ne-rNP/arrays.xml)0
-rw-r--r--res/values-ne/rating_system_strings.xml (renamed from res/values-ne-rNP/rating_system_strings.xml)0
-rw-r--r--res/values-ne/strings.xml (renamed from res/values-ne-rNP/strings.xml)0
-rw-r--r--res/values-si-v23/strings.xml (renamed from res/values-si-rLK-v23/strings.xml)0
-rw-r--r--res/values-si/arrays.xml (renamed from res/values-si-rLK/arrays.xml)0
-rw-r--r--res/values-si/rating_system_strings.xml (renamed from res/values-si-rLK/rating_system_strings.xml)0
-rw-r--r--res/values-si/strings.xml (renamed from res/values-si-rLK/strings.xml)0
-rw-r--r--res/values-ta-v23/strings.xml (renamed from res/values-ta-rIN-v23/strings.xml)0
-rw-r--r--res/values-ta/arrays.xml (renamed from res/values-ta-rIN/arrays.xml)0
-rw-r--r--res/values-ta/rating_system_strings.xml (renamed from res/values-ta-rIN/rating_system_strings.xml)0
-rw-r--r--res/values-ta/strings.xml (renamed from res/values-ta-rIN/strings.xml)0
-rw-r--r--res/values-te-v23/strings.xml (renamed from res/values-te-rIN-v23/strings.xml)0
-rw-r--r--res/values-te/arrays.xml (renamed from res/values-te-rIN/arrays.xml)0
-rw-r--r--res/values-te/rating_system_strings.xml (renamed from res/values-te-rIN/rating_system_strings.xml)0
-rw-r--r--res/values-te/strings.xml (renamed from res/values-te-rIN/strings.xml)0
-rw-r--r--res/values-ur-v23/strings.xml (renamed from res/values-ur-rPK-v23/strings.xml)0
-rw-r--r--res/values-ur/arrays.xml (renamed from res/values-ur-rPK/arrays.xml)0
-rw-r--r--res/values-ur/rating_system_strings.xml (renamed from res/values-ur-rPK/rating_system_strings.xml)0
-rw-r--r--res/values-ur/strings.xml (renamed from res/values-ur-rPK/strings.xml)0
-rw-r--r--res/values-uz-v23/strings.xml (renamed from res/values-uz-rUZ-v23/strings.xml)0
-rw-r--r--res/values-uz/arrays.xml (renamed from res/values-uz-rUZ/arrays.xml)0
-rw-r--r--res/values-uz/rating_system_strings.xml (renamed from res/values-uz-rUZ/rating_system_strings.xml)0
-rw-r--r--res/values-uz/strings.xml (renamed from res/values-uz-rUZ/strings.xml)0
-rw-r--r--src/com/android/tv/tuner/ChannelScanFileParser.java2
-rw-r--r--src/com/android/tv/tuner/cc/CaptionLayout.java2
-rw-r--r--src/com/android/tv/tuner/cc/CaptionTrackRenderer.java2
-rw-r--r--src/com/android/tv/tuner/data/PsiData.java4
-rw-r--r--src/com/android/tv/tuner/data/PsipData.java4
-rw-r--r--src/com/android/tv/tuner/data/TunerChannel.java8
-rw-r--r--src/com/android/tv/tuner/setup/ScanFragment.java2
-rw-r--r--src/com/android/tv/tuner/source/TsDataSourceManager.java2
-rw-r--r--src/com/android/tv/tuner/ts/SectionParser.java6
-rw-r--r--src/com/android/tv/tuner/tvinput/EventDetector.java4
-rw-r--r--src/com/android/tv/tuner/tvinput/FileSourceEventDetector.java4
-rw-r--r--src/com/android/tv/tuner/tvinput/TunerSession.java2
-rw-r--r--src/com/android/tv/tuner/tvinput/TunerSessionWorker.java6
-rw-r--r--usbtuner-res/values-az/strings.xml (renamed from usbtuner-res/values-az-rAZ/strings.xml)0
-rw-r--r--usbtuner-res/values-bn/strings.xml (renamed from usbtuner-res/values-bn-rBD/strings.xml)0
-rw-r--r--usbtuner-res/values-et/strings.xml (renamed from usbtuner-res/values-et-rEE/strings.xml)0
-rw-r--r--usbtuner-res/values-eu/strings.xml (renamed from usbtuner-res/values-eu-rES/strings.xml)0
-rw-r--r--usbtuner-res/values-gl/strings.xml (renamed from usbtuner-res/values-gl-rES/strings.xml)0
-rw-r--r--usbtuner-res/values-hy/strings.xml (renamed from usbtuner-res/values-hy-rAM/strings.xml)0
-rw-r--r--usbtuner-res/values-is/strings.xml (renamed from usbtuner-res/values-is-rIS/strings.xml)0
-rw-r--r--usbtuner-res/values-ka/strings.xml (renamed from usbtuner-res/values-ka-rGE/strings.xml)0
-rw-r--r--usbtuner-res/values-kk/strings.xml (renamed from usbtuner-res/values-kk-rKZ/strings.xml)0
-rw-r--r--usbtuner-res/values-km/strings.xml (renamed from usbtuner-res/values-km-rKH/strings.xml)0
-rw-r--r--usbtuner-res/values-kn/strings.xml (renamed from usbtuner-res/values-kn-rIN/strings.xml)0
-rw-r--r--usbtuner-res/values-ky/strings.xml (renamed from usbtuner-res/values-ky-rKG/strings.xml)0
-rw-r--r--usbtuner-res/values-lo/strings.xml (renamed from usbtuner-res/values-lo-rLA/strings.xml)0
-rw-r--r--usbtuner-res/values-mk/strings.xml (renamed from usbtuner-res/values-mk-rMK/strings.xml)0
-rw-r--r--usbtuner-res/values-ml/strings.xml (renamed from usbtuner-res/values-ml-rIN/strings.xml)0
-rw-r--r--usbtuner-res/values-mn/strings.xml (renamed from usbtuner-res/values-mn-rMN/strings.xml)0
-rw-r--r--usbtuner-res/values-mr/strings.xml (renamed from usbtuner-res/values-mr-rIN/strings.xml)0
-rw-r--r--usbtuner-res/values-ms/strings.xml (renamed from usbtuner-res/values-ms-rMY/strings.xml)0
-rw-r--r--usbtuner-res/values-my/strings.xml (renamed from usbtuner-res/values-my-rMM/strings.xml)0
-rw-r--r--usbtuner-res/values-ne/strings.xml (renamed from usbtuner-res/values-ne-rNP/strings.xml)0
-rw-r--r--usbtuner-res/values-si/strings.xml (renamed from usbtuner-res/values-si-rLK/strings.xml)0
-rw-r--r--usbtuner-res/values-ta/strings.xml (renamed from usbtuner-res/values-ta-rIN/strings.xml)0
-rw-r--r--usbtuner-res/values-te/strings.xml (renamed from usbtuner-res/values-te-rIN/strings.xml)0
-rw-r--r--usbtuner-res/values-ur/strings.xml (renamed from usbtuner-res/values-ur-rPK/strings.xml)0
-rw-r--r--usbtuner-res/values-uz/strings.xml (renamed from usbtuner-res/values-uz-rUZ/strings.xml)0
162 files changed, 24 insertions, 24 deletions
diff --git a/common/res/values-az-rAZ/strings.xml b/common/res/values-az/strings.xml
index c844cd60..c844cd60 100644
--- a/common/res/values-az-rAZ/strings.xml
+++ b/common/res/values-az/strings.xml
diff --git a/common/res/values-bn-rBD/strings.xml b/common/res/values-bn/strings.xml
index 836a62a5..836a62a5 100644
--- a/common/res/values-bn-rBD/strings.xml
+++ b/common/res/values-bn/strings.xml
diff --git a/common/res/values-et-rEE/strings.xml b/common/res/values-et/strings.xml
index 9052178a..9052178a 100644
--- a/common/res/values-et-rEE/strings.xml
+++ b/common/res/values-et/strings.xml
diff --git a/common/res/values-eu-rES/strings.xml b/common/res/values-eu/strings.xml
index d7ab52a8..d7ab52a8 100644
--- a/common/res/values-eu-rES/strings.xml
+++ b/common/res/values-eu/strings.xml
diff --git a/common/res/values-gl-rES/strings.xml b/common/res/values-gl/strings.xml
index 356ac562..356ac562 100644
--- a/common/res/values-gl-rES/strings.xml
+++ b/common/res/values-gl/strings.xml
diff --git a/common/res/values-hy-rAM/strings.xml b/common/res/values-hy/strings.xml
index aaa7470f..aaa7470f 100644
--- a/common/res/values-hy-rAM/strings.xml
+++ b/common/res/values-hy/strings.xml
diff --git a/common/res/values-is-rIS/strings.xml b/common/res/values-is/strings.xml
index 47529403..47529403 100644
--- a/common/res/values-is-rIS/strings.xml
+++ b/common/res/values-is/strings.xml
diff --git a/common/res/values-ka-rGE/strings.xml b/common/res/values-ka/strings.xml
index 3c7062ff..3c7062ff 100644
--- a/common/res/values-ka-rGE/strings.xml
+++ b/common/res/values-ka/strings.xml
diff --git a/common/res/values-kk-rKZ/strings.xml b/common/res/values-kk/strings.xml
index 12de7d34..12de7d34 100644
--- a/common/res/values-kk-rKZ/strings.xml
+++ b/common/res/values-kk/strings.xml
diff --git a/common/res/values-km-rKH/strings.xml b/common/res/values-km/strings.xml
index b8353897..b8353897 100644
--- a/common/res/values-km-rKH/strings.xml
+++ b/common/res/values-km/strings.xml
diff --git a/common/res/values-kn-rIN/strings.xml b/common/res/values-kn/strings.xml
index 7cb096b7..7cb096b7 100644
--- a/common/res/values-kn-rIN/strings.xml
+++ b/common/res/values-kn/strings.xml
diff --git a/common/res/values-ky-rKG/strings.xml b/common/res/values-ky/strings.xml
index 8bdfadde..8bdfadde 100644
--- a/common/res/values-ky-rKG/strings.xml
+++ b/common/res/values-ky/strings.xml
diff --git a/common/res/values-lo-rLA/strings.xml b/common/res/values-lo/strings.xml
index a6dad515..a6dad515 100644
--- a/common/res/values-lo-rLA/strings.xml
+++ b/common/res/values-lo/strings.xml
diff --git a/common/res/values-mk-rMK/strings.xml b/common/res/values-mk/strings.xml
index 73045d3d..73045d3d 100644
--- a/common/res/values-mk-rMK/strings.xml
+++ b/common/res/values-mk/strings.xml
diff --git a/common/res/values-ml-rIN/strings.xml b/common/res/values-ml/strings.xml
index 07727684..07727684 100644
--- a/common/res/values-ml-rIN/strings.xml
+++ b/common/res/values-ml/strings.xml
diff --git a/common/res/values-mn-rMN/strings.xml b/common/res/values-mn/strings.xml
index ff1552e0..ff1552e0 100644
--- a/common/res/values-mn-rMN/strings.xml
+++ b/common/res/values-mn/strings.xml
diff --git a/common/res/values-mr-rIN/strings.xml b/common/res/values-mr/strings.xml
index adc669ae..adc669ae 100644
--- a/common/res/values-mr-rIN/strings.xml
+++ b/common/res/values-mr/strings.xml
diff --git a/common/res/values-ms-rMY/strings.xml b/common/res/values-ms/strings.xml
index 06eb6173..06eb6173 100644
--- a/common/res/values-ms-rMY/strings.xml
+++ b/common/res/values-ms/strings.xml
diff --git a/common/res/values-my-rMM/strings.xml b/common/res/values-my/strings.xml
index 977c4315..977c4315 100644
--- a/common/res/values-my-rMM/strings.xml
+++ b/common/res/values-my/strings.xml
diff --git a/common/res/values-ne-rNP/strings.xml b/common/res/values-ne/strings.xml
index 4f3d24c1..4f3d24c1 100644
--- a/common/res/values-ne-rNP/strings.xml
+++ b/common/res/values-ne/strings.xml
diff --git a/common/res/values-si-rLK/strings.xml b/common/res/values-si/strings.xml
index 85fc1f94..85fc1f94 100644
--- a/common/res/values-si-rLK/strings.xml
+++ b/common/res/values-si/strings.xml
diff --git a/common/res/values-ta-rIN/strings.xml b/common/res/values-ta/strings.xml
index bc2eed62..bc2eed62 100644
--- a/common/res/values-ta-rIN/strings.xml
+++ b/common/res/values-ta/strings.xml
diff --git a/common/res/values-te-rIN/strings.xml b/common/res/values-te/strings.xml
index 80df229d..80df229d 100644
--- a/common/res/values-te-rIN/strings.xml
+++ b/common/res/values-te/strings.xml
diff --git a/common/res/values-ur-rPK/strings.xml b/common/res/values-ur/strings.xml
index b04fb3c3..b04fb3c3 100644
--- a/common/res/values-ur-rPK/strings.xml
+++ b/common/res/values-ur/strings.xml
diff --git a/common/res/values-uz-rUZ/strings.xml b/common/res/values-uz/strings.xml
index ffa1cf9c..ffa1cf9c 100644
--- a/common/res/values-uz-rUZ/strings.xml
+++ b/common/res/values-uz/strings.xml
diff --git a/res/values-az-rAZ/arrays.xml b/res/values-az/arrays.xml
index 7f891617..7f891617 100644
--- a/res/values-az-rAZ/arrays.xml
+++ b/res/values-az/arrays.xml
diff --git a/res/values-az-rAZ/rating_system_strings.xml b/res/values-az/rating_system_strings.xml
index bd28a4e8..bd28a4e8 100644
--- a/res/values-az-rAZ/rating_system_strings.xml
+++ b/res/values-az/rating_system_strings.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml
index 6ccb6d24..6ccb6d24 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az/strings.xml
diff --git a/res/values-bn-rBD-v23/strings.xml b/res/values-bn-v23/strings.xml
index b3134242..b3134242 100644
--- a/res/values-bn-rBD-v23/strings.xml
+++ b/res/values-bn-v23/strings.xml
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn/arrays.xml
index 76a0792a..76a0792a 100644
--- a/res/values-bn-rBD/arrays.xml
+++ b/res/values-bn/arrays.xml
diff --git a/res/values-bn-rBD/rating_system_strings.xml b/res/values-bn/rating_system_strings.xml
index 81c9593b..81c9593b 100644
--- a/res/values-bn-rBD/rating_system_strings.xml
+++ b/res/values-bn/rating_system_strings.xml
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml
index 52938ab2..52938ab2 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn/strings.xml
diff --git a/res/values-et-rEE-v23/strings.xml b/res/values-et-v23/strings.xml
index e981deeb..e981deeb 100644
--- a/res/values-et-rEE-v23/strings.xml
+++ b/res/values-et-v23/strings.xml
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et/arrays.xml
index 2d1d11fd..2d1d11fd 100644
--- a/res/values-et-rEE/arrays.xml
+++ b/res/values-et/arrays.xml
diff --git a/res/values-et-rEE/rating_system_strings.xml b/res/values-et/rating_system_strings.xml
index 5cee5abd..5cee5abd 100644
--- a/res/values-et-rEE/rating_system_strings.xml
+++ b/res/values-et/rating_system_strings.xml
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml
index 83022b8e..83022b8e 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et/strings.xml
diff --git a/res/values-eu-rES-v23/strings.xml b/res/values-eu-v23/strings.xml
index 86f40b71..86f40b71 100644
--- a/res/values-eu-rES-v23/strings.xml
+++ b/res/values-eu-v23/strings.xml
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu/arrays.xml
index 89b32135..89b32135 100644
--- a/res/values-eu-rES/arrays.xml
+++ b/res/values-eu/arrays.xml
diff --git a/res/values-eu-rES/rating_system_strings.xml b/res/values-eu/rating_system_strings.xml
index ae0d84d4..ae0d84d4 100644
--- a/res/values-eu-rES/rating_system_strings.xml
+++ b/res/values-eu/rating_system_strings.xml
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml
index 19a00433..19a00433 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu/strings.xml
diff --git a/res/values-gl-rES-v23/strings.xml b/res/values-gl-v23/strings.xml
index 7cb59c66..7cb59c66 100644
--- a/res/values-gl-rES-v23/strings.xml
+++ b/res/values-gl-v23/strings.xml
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl/arrays.xml
index 0bbc3853..0bbc3853 100644
--- a/res/values-gl-rES/arrays.xml
+++ b/res/values-gl/arrays.xml
diff --git a/res/values-gl-rES/rating_system_strings.xml b/res/values-gl/rating_system_strings.xml
index 20456b34..20456b34 100644
--- a/res/values-gl-rES/rating_system_strings.xml
+++ b/res/values-gl/rating_system_strings.xml
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml
index 7ce0ac2d..7ce0ac2d 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl/strings.xml
diff --git a/res/values-hy-rAM-v23/strings.xml b/res/values-hy-v23/strings.xml
index 774fbd3d..774fbd3d 100644
--- a/res/values-hy-rAM-v23/strings.xml
+++ b/res/values-hy-v23/strings.xml
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy/arrays.xml
index 5c6f0bfd..5c6f0bfd 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy/arrays.xml
diff --git a/res/values-hy-rAM/rating_system_strings.xml b/res/values-hy/rating_system_strings.xml
index 8c69ca7e..8c69ca7e 100644
--- a/res/values-hy-rAM/rating_system_strings.xml
+++ b/res/values-hy/rating_system_strings.xml
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy/strings.xml
index d10652e1..d10652e1 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy/strings.xml
diff --git a/res/values-is-rIS-v23/strings.xml b/res/values-is-v23/strings.xml
index 2954d77b..2954d77b 100644
--- a/res/values-is-rIS-v23/strings.xml
+++ b/res/values-is-v23/strings.xml
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is/arrays.xml
index 27cb8655..27cb8655 100644
--- a/res/values-is-rIS/arrays.xml
+++ b/res/values-is/arrays.xml
diff --git a/res/values-is-rIS/rating_system_strings.xml b/res/values-is/rating_system_strings.xml
index 1725d040..1725d040 100644
--- a/res/values-is-rIS/rating_system_strings.xml
+++ b/res/values-is/rating_system_strings.xml
diff --git a/res/values-is-rIS/strings.xml b/res/values-is/strings.xml
index 6111b578..6111b578 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is/strings.xml
diff --git a/res/values-ka-rGE-v23/strings.xml b/res/values-ka-v23/strings.xml
index 20f03595..20f03595 100644
--- a/res/values-ka-rGE-v23/strings.xml
+++ b/res/values-ka-v23/strings.xml
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka/arrays.xml
index 1d6659a6..1d6659a6 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka/arrays.xml
diff --git a/res/values-ka-rGE/rating_system_strings.xml b/res/values-ka/rating_system_strings.xml
index 498d1d82..498d1d82 100644
--- a/res/values-ka-rGE/rating_system_strings.xml
+++ b/res/values-ka/rating_system_strings.xml
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka/strings.xml
index 72608bd4..72608bd4 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka/strings.xml
diff --git a/res/values-kk-rKZ-v23/strings.xml b/res/values-kk-v23/strings.xml
index 4da42f69..4da42f69 100644
--- a/res/values-kk-rKZ-v23/strings.xml
+++ b/res/values-kk-v23/strings.xml
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk/arrays.xml
index bbb0282c..bbb0282c 100644
--- a/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk/arrays.xml
diff --git a/res/values-kk-rKZ/rating_system_strings.xml b/res/values-kk/rating_system_strings.xml
index efeb4715..efeb4715 100644
--- a/res/values-kk-rKZ/rating_system_strings.xml
+++ b/res/values-kk/rating_system_strings.xml
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk/strings.xml
index 2a47972c..2a47972c 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk/strings.xml
diff --git a/res/values-km-rKH-v23/strings.xml b/res/values-km-v23/strings.xml
index 67c48f05..67c48f05 100644
--- a/res/values-km-rKH-v23/strings.xml
+++ b/res/values-km-v23/strings.xml
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km/arrays.xml
index e46312b4..e46312b4 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km/arrays.xml
diff --git a/res/values-km-rKH/rating_system_strings.xml b/res/values-km/rating_system_strings.xml
index 8f5df6b3..8f5df6b3 100644
--- a/res/values-km-rKH/rating_system_strings.xml
+++ b/res/values-km/rating_system_strings.xml
diff --git a/res/values-km-rKH/strings.xml b/res/values-km/strings.xml
index 98fa13f5..98fa13f5 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km/strings.xml
diff --git a/res/values-kn-rIN-v23/strings.xml b/res/values-kn-v23/strings.xml
index 95f50839..95f50839 100644
--- a/res/values-kn-rIN-v23/strings.xml
+++ b/res/values-kn-v23/strings.xml
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn/arrays.xml
index e6d19c9f..e6d19c9f 100644
--- a/res/values-kn-rIN/arrays.xml
+++ b/res/values-kn/arrays.xml
diff --git a/res/values-kn-rIN/rating_system_strings.xml b/res/values-kn/rating_system_strings.xml
index 4d878099..4d878099 100644
--- a/res/values-kn-rIN/rating_system_strings.xml
+++ b/res/values-kn/rating_system_strings.xml
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml
index adc99656..adc99656 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn/strings.xml
diff --git a/res/values-ky-rKG-v23/strings.xml b/res/values-ky-v23/strings.xml
index ae85b5f8..ae85b5f8 100644
--- a/res/values-ky-rKG-v23/strings.xml
+++ b/res/values-ky-v23/strings.xml
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky/arrays.xml
index 835274e6..835274e6 100644
--- a/res/values-ky-rKG/arrays.xml
+++ b/res/values-ky/arrays.xml
diff --git a/res/values-ky-rKG/rating_system_strings.xml b/res/values-ky/rating_system_strings.xml
index 1d422a0c..1d422a0c 100644
--- a/res/values-ky-rKG/rating_system_strings.xml
+++ b/res/values-ky/rating_system_strings.xml
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky/strings.xml
index 2b9d37ab..2b9d37ab 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky/strings.xml
diff --git a/res/values-lo-rLA-v23/strings.xml b/res/values-lo-v23/strings.xml
index 53804594..53804594 100644
--- a/res/values-lo-rLA-v23/strings.xml
+++ b/res/values-lo-v23/strings.xml
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo/arrays.xml
index 5e1c1e0c..5e1c1e0c 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo/arrays.xml
diff --git a/res/values-lo-rLA/rating_system_strings.xml b/res/values-lo/rating_system_strings.xml
index 534b6a89..534b6a89 100644
--- a/res/values-lo-rLA/rating_system_strings.xml
+++ b/res/values-lo/rating_system_strings.xml
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo/strings.xml
index 05aba1ce..05aba1ce 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo/strings.xml
diff --git a/res/values-mk-rMK-v23/strings.xml b/res/values-mk-v23/strings.xml
index 4fd7f740..4fd7f740 100644
--- a/res/values-mk-rMK-v23/strings.xml
+++ b/res/values-mk-v23/strings.xml
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk/arrays.xml
index b1ae7467..b1ae7467 100644
--- a/res/values-mk-rMK/arrays.xml
+++ b/res/values-mk/arrays.xml
diff --git a/res/values-mk-rMK/rating_system_strings.xml b/res/values-mk/rating_system_strings.xml
index da9a40b3..da9a40b3 100644
--- a/res/values-mk-rMK/rating_system_strings.xml
+++ b/res/values-mk/rating_system_strings.xml
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk/strings.xml
index 566377a8..566377a8 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk/strings.xml
diff --git a/res/values-ml-rIN-v23/strings.xml b/res/values-ml-v23/strings.xml
index 2333cc0f..2333cc0f 100644
--- a/res/values-ml-rIN-v23/strings.xml
+++ b/res/values-ml-v23/strings.xml
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml/arrays.xml
index 383837e7..383837e7 100644
--- a/res/values-ml-rIN/arrays.xml
+++ b/res/values-ml/arrays.xml
diff --git a/res/values-ml-rIN/rating_system_strings.xml b/res/values-ml/rating_system_strings.xml
index e17f91f8..e17f91f8 100644
--- a/res/values-ml-rIN/rating_system_strings.xml
+++ b/res/values-ml/rating_system_strings.xml
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml
index e29a8755..e29a8755 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml/strings.xml
diff --git a/res/values-mn-rMN-v23/strings.xml b/res/values-mn-v23/strings.xml
index 7da24abf..7da24abf 100644
--- a/res/values-mn-rMN-v23/strings.xml
+++ b/res/values-mn-v23/strings.xml
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn/arrays.xml
index 3d0b16ba..3d0b16ba 100644
--- a/res/values-mn-rMN/arrays.xml
+++ b/res/values-mn/arrays.xml
diff --git a/res/values-mn-rMN/rating_system_strings.xml b/res/values-mn/rating_system_strings.xml
index 7c883a13..7c883a13 100644
--- a/res/values-mn-rMN/rating_system_strings.xml
+++ b/res/values-mn/rating_system_strings.xml
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn/strings.xml
index e99f8a0e..e99f8a0e 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn/strings.xml
diff --git a/res/values-mr-rIN-v23/strings.xml b/res/values-mr-v23/strings.xml
index d7b703e6..d7b703e6 100644
--- a/res/values-mr-rIN-v23/strings.xml
+++ b/res/values-mr-v23/strings.xml
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr/arrays.xml
index a91434f4..a91434f4 100644
--- a/res/values-mr-rIN/arrays.xml
+++ b/res/values-mr/arrays.xml
diff --git a/res/values-mr-rIN/rating_system_strings.xml b/res/values-mr/rating_system_strings.xml
index d192c799..d192c799 100644
--- a/res/values-mr-rIN/rating_system_strings.xml
+++ b/res/values-mr/rating_system_strings.xml
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml
index 1888e9de..1888e9de 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr/strings.xml
diff --git a/res/values-ms-rMY-v23/strings.xml b/res/values-ms-v23/strings.xml
index ba29d7b7..ba29d7b7 100644
--- a/res/values-ms-rMY-v23/strings.xml
+++ b/res/values-ms-v23/strings.xml
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms/arrays.xml
index 16ccce64..16ccce64 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms/arrays.xml
diff --git a/res/values-ms-rMY/rating_system_strings.xml b/res/values-ms/rating_system_strings.xml
index a5f781fe..a5f781fe 100644
--- a/res/values-ms-rMY/rating_system_strings.xml
+++ b/res/values-ms/rating_system_strings.xml
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml
index 816dee35..816dee35 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms/strings.xml
diff --git a/res/values-my-rMM-v23/strings.xml b/res/values-my-v23/strings.xml
index 015247d8..015247d8 100644
--- a/res/values-my-rMM-v23/strings.xml
+++ b/res/values-my-v23/strings.xml
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my/arrays.xml
index e302ceac..e302ceac 100644
--- a/res/values-my-rMM/arrays.xml
+++ b/res/values-my/arrays.xml
diff --git a/res/values-my-rMM/rating_system_strings.xml b/res/values-my/rating_system_strings.xml
index 153ad407..153ad407 100644
--- a/res/values-my-rMM/rating_system_strings.xml
+++ b/res/values-my/rating_system_strings.xml
diff --git a/res/values-my-rMM/strings.xml b/res/values-my/strings.xml
index 1ab6baf7..1ab6baf7 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my/strings.xml
diff --git a/res/values-ne-rNP-v23/strings.xml b/res/values-ne-v23/strings.xml
index 67220466..67220466 100644
--- a/res/values-ne-rNP-v23/strings.xml
+++ b/res/values-ne-v23/strings.xml
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne/arrays.xml
index a6dc0066..a6dc0066 100644
--- a/res/values-ne-rNP/arrays.xml
+++ b/res/values-ne/arrays.xml
diff --git a/res/values-ne-rNP/rating_system_strings.xml b/res/values-ne/rating_system_strings.xml
index 776e7175..776e7175 100644
--- a/res/values-ne-rNP/rating_system_strings.xml
+++ b/res/values-ne/rating_system_strings.xml
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne/strings.xml
index 142dfade..142dfade 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne/strings.xml
diff --git a/res/values-si-rLK-v23/strings.xml b/res/values-si-v23/strings.xml
index 1209e55b..1209e55b 100644
--- a/res/values-si-rLK-v23/strings.xml
+++ b/res/values-si-v23/strings.xml
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si/arrays.xml
index 657fb91d..657fb91d 100644
--- a/res/values-si-rLK/arrays.xml
+++ b/res/values-si/arrays.xml
diff --git a/res/values-si-rLK/rating_system_strings.xml b/res/values-si/rating_system_strings.xml
index f22044ba..f22044ba 100644
--- a/res/values-si-rLK/rating_system_strings.xml
+++ b/res/values-si/rating_system_strings.xml
diff --git a/res/values-si-rLK/strings.xml b/res/values-si/strings.xml
index eab8c336..eab8c336 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si/strings.xml
diff --git a/res/values-ta-rIN-v23/strings.xml b/res/values-ta-v23/strings.xml
index 1b94e0c4..1b94e0c4 100644
--- a/res/values-ta-rIN-v23/strings.xml
+++ b/res/values-ta-v23/strings.xml
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta/arrays.xml
index 9d2c1f24..9d2c1f24 100644
--- a/res/values-ta-rIN/arrays.xml
+++ b/res/values-ta/arrays.xml
diff --git a/res/values-ta-rIN/rating_system_strings.xml b/res/values-ta/rating_system_strings.xml
index ae80dee6..ae80dee6 100644
--- a/res/values-ta-rIN/rating_system_strings.xml
+++ b/res/values-ta/rating_system_strings.xml
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta/strings.xml
index 7d13e3cf..7d13e3cf 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta/strings.xml
diff --git a/res/values-te-rIN-v23/strings.xml b/res/values-te-v23/strings.xml
index ac59e7af..ac59e7af 100644
--- a/res/values-te-rIN-v23/strings.xml
+++ b/res/values-te-v23/strings.xml
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te/arrays.xml
index de6abf32..de6abf32 100644
--- a/res/values-te-rIN/arrays.xml
+++ b/res/values-te/arrays.xml
diff --git a/res/values-te-rIN/rating_system_strings.xml b/res/values-te/rating_system_strings.xml
index 6179802b..6179802b 100644
--- a/res/values-te-rIN/rating_system_strings.xml
+++ b/res/values-te/rating_system_strings.xml
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml
index 274be2ce..274be2ce 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te/strings.xml
diff --git a/res/values-ur-rPK-v23/strings.xml b/res/values-ur-v23/strings.xml
index 22ec8b49..22ec8b49 100644
--- a/res/values-ur-rPK-v23/strings.xml
+++ b/res/values-ur-v23/strings.xml
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur/arrays.xml
index f54b4914..f54b4914 100644
--- a/res/values-ur-rPK/arrays.xml
+++ b/res/values-ur/arrays.xml
diff --git a/res/values-ur-rPK/rating_system_strings.xml b/res/values-ur/rating_system_strings.xml
index 07f99a99..07f99a99 100644
--- a/res/values-ur-rPK/rating_system_strings.xml
+++ b/res/values-ur/rating_system_strings.xml
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur/strings.xml
index 47fcb2ad..47fcb2ad 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur/strings.xml
diff --git a/res/values-uz-rUZ-v23/strings.xml b/res/values-uz-v23/strings.xml
index 9d1c1de7..9d1c1de7 100644
--- a/res/values-uz-rUZ-v23/strings.xml
+++ b/res/values-uz-v23/strings.xml
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz/arrays.xml
index 71619002..71619002 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz/arrays.xml
diff --git a/res/values-uz-rUZ/rating_system_strings.xml b/res/values-uz/rating_system_strings.xml
index 91d82748..91d82748 100644
--- a/res/values-uz-rUZ/rating_system_strings.xml
+++ b/res/values-uz/rating_system_strings.xml
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz/strings.xml
index 55a0324f..55a0324f 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz/strings.xml
diff --git a/src/com/android/tv/tuner/ChannelScanFileParser.java b/src/com/android/tv/tuner/ChannelScanFileParser.java
index 8b06aaa9..2dd36074 100644
--- a/src/com/android/tv/tuner/ChannelScanFileParser.java
+++ b/src/com/android/tv/tuner/ChannelScanFileParser.java
@@ -18,7 +18,7 @@ package com.android.tv.tuner;
import android.util.Log;
-import com.android.tv.tuner.data.Channel;
+import com.android.tv.tuner.data.nano.Channel;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/src/com/android/tv/tuner/cc/CaptionLayout.java b/src/com/android/tv/tuner/cc/CaptionLayout.java
index c41f1014..a88538df 100644
--- a/src/com/android/tv/tuner/cc/CaptionLayout.java
+++ b/src/com/android/tv/tuner/cc/CaptionLayout.java
@@ -19,7 +19,7 @@ package com.android.tv.tuner.cc;
import android.content.Context;
import android.util.AttributeSet;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
import com.android.tv.tuner.layout.ScaledLayout;
/**
diff --git a/src/com/android/tv/tuner/cc/CaptionTrackRenderer.java b/src/com/android/tv/tuner/cc/CaptionTrackRenderer.java
index 3aa40982..3c75caa9 100644
--- a/src/com/android/tv/tuner/cc/CaptionTrackRenderer.java
+++ b/src/com/android/tv/tuner/cc/CaptionTrackRenderer.java
@@ -27,7 +27,7 @@ import com.android.tv.tuner.data.Cea708Data.CaptionPenColor;
import com.android.tv.tuner.data.Cea708Data.CaptionPenLocation;
import com.android.tv.tuner.data.Cea708Data.CaptionWindow;
import com.android.tv.tuner.data.Cea708Data.CaptionWindowAttr;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
import java.util.ArrayList;
import java.util.concurrent.TimeUnit;
diff --git a/src/com/android/tv/tuner/data/PsiData.java b/src/com/android/tv/tuner/data/PsiData.java
index 2c8a52db..67700c6a 100644
--- a/src/com/android/tv/tuner/data/PsiData.java
+++ b/src/com/android/tv/tuner/data/PsiData.java
@@ -17,8 +17,8 @@
package com.android.tv.tuner.data;
-import com.android.tv.tuner.data.Track.AtscAudioTrack;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
+import com.android.tv.tuner.data.nano.Track.AtscAudioTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
import java.util.List;
diff --git a/src/com/android/tv/tuner/data/PsipData.java b/src/com/android/tv/tuner/data/PsipData.java
index e3cdb3a9..aead4be8 100644
--- a/src/com/android/tv/tuner/data/PsipData.java
+++ b/src/com/android/tv/tuner/data/PsipData.java
@@ -20,8 +20,8 @@ import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.text.format.DateUtils;
-import com.android.tv.tuner.data.Track.AtscAudioTrack;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
+import com.android.tv.tuner.data.nano.Track.AtscAudioTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
import com.android.tv.tuner.ts.SectionParser;
import com.android.tv.tuner.util.ConvertUtils;
import com.android.tv.tuner.util.StringUtils;
diff --git a/src/com/android/tv/tuner/data/TunerChannel.java b/src/com/android/tv/tuner/data/TunerChannel.java
index 22cf2aa6..89079d77 100644
--- a/src/com/android/tv/tuner/data/TunerChannel.java
+++ b/src/com/android/tv/tuner/data/TunerChannel.java
@@ -19,10 +19,10 @@ package com.android.tv.tuner.data;
import android.support.annotation.NonNull;
import android.util.Log;
-import com.android.tv.tuner.data.Channel;
-import com.android.tv.tuner.data.Channel.TunerChannelProto;
-import com.android.tv.tuner.data.Track.AtscAudioTrack;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
+import com.android.tv.tuner.data.nano.Channel;
+import com.android.tv.tuner.data.nano.Channel.TunerChannelProto;
+import com.android.tv.tuner.data.nano.Track.AtscAudioTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
import com.android.tv.tuner.util.Ints;
import com.android.tv.tuner.util.StringUtils;
import com.google.protobuf.nano.MessageNano;
diff --git a/src/com/android/tv/tuner/setup/ScanFragment.java b/src/com/android/tv/tuner/setup/ScanFragment.java
index 4b3ffe40..3b61debb 100644
--- a/src/com/android/tv/tuner/setup/ScanFragment.java
+++ b/src/com/android/tv/tuner/setup/ScanFragment.java
@@ -42,7 +42,7 @@ import com.android.tv.tuner.ChannelScanFileParser;
import com.android.tv.tuner.TunerHal;
import com.android.tv.tuner.R;
import com.android.tv.tuner.TunerPreferences;
-import com.android.tv.tuner.data.Channel;
+import com.android.tv.tuner.data.nano.Channel;
import com.android.tv.tuner.data.PsipData;
import com.android.tv.tuner.data.TunerChannel;
import com.android.tv.tuner.source.FileTsStreamer;
diff --git a/src/com/android/tv/tuner/source/TsDataSourceManager.java b/src/com/android/tv/tuner/source/TsDataSourceManager.java
index 7286cd8c..ccbb75ba 100644
--- a/src/com/android/tv/tuner/source/TsDataSourceManager.java
+++ b/src/com/android/tv/tuner/source/TsDataSourceManager.java
@@ -18,7 +18,7 @@ package com.android.tv.tuner.source;
import android.content.Context;
-import com.android.tv.tuner.data.Channel;
+import com.android.tv.tuner.data.nano.Channel;
import com.android.tv.tuner.data.TunerChannel;
import com.android.tv.tuner.tvinput.EventDetector;
diff --git a/src/com/android/tv/tuner/ts/SectionParser.java b/src/com/android/tv/tuner/ts/SectionParser.java
index 5d3e728a..8c1f6a1b 100644
--- a/src/com/android/tv/tuner/ts/SectionParser.java
+++ b/src/com/android/tv/tuner/ts/SectionParser.java
@@ -22,7 +22,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;
-import com.android.tv.tuner.data.Channel;
+import com.android.tv.tuner.data.nano.Channel;
import com.android.tv.tuner.data.PsiData.PatItem;
import com.android.tv.tuner.data.PsiData.PmtItem;
import com.android.tv.tuner.data.PsipData.Ac3AudioDescriptor;
@@ -39,8 +39,8 @@ import com.android.tv.tuner.data.PsipData.RatingRegion;
import com.android.tv.tuner.data.PsipData.RegionalRating;
import com.android.tv.tuner.data.PsipData.TsDescriptor;
import com.android.tv.tuner.data.PsipData.VctItem;
-import com.android.tv.tuner.data.Track.AtscAudioTrack;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
+import com.android.tv.tuner.data.nano.Track.AtscAudioTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
import com.android.tv.tuner.util.ByteArrayBuffer;
import com.ibm.icu.text.UnicodeDecompressor;
diff --git a/src/com/android/tv/tuner/tvinput/EventDetector.java b/src/com/android/tv/tuner/tvinput/EventDetector.java
index 27bbb8c7..a132398f 100644
--- a/src/com/android/tv/tuner/tvinput/EventDetector.java
+++ b/src/com/android/tv/tuner/tvinput/EventDetector.java
@@ -21,8 +21,8 @@ import android.util.SparseArray;
import android.util.SparseBooleanArray;
import com.android.tv.tuner.TunerHal;
-import com.android.tv.tuner.data.Track.AtscAudioTrack;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
+import com.android.tv.tuner.data.nano.Track.AtscAudioTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
import com.android.tv.tuner.data.TunerChannel;
import com.android.tv.tuner.ts.TsParser;
import com.android.tv.tuner.data.PsiData;
diff --git a/src/com/android/tv/tuner/tvinput/FileSourceEventDetector.java b/src/com/android/tv/tuner/tvinput/FileSourceEventDetector.java
index 46ff4ea1..61de24f4 100644
--- a/src/com/android/tv/tuner/tvinput/FileSourceEventDetector.java
+++ b/src/com/android/tv/tuner/tvinput/FileSourceEventDetector.java
@@ -24,8 +24,8 @@ import com.android.tv.tuner.data.PsiData.PatItem;
import com.android.tv.tuner.data.PsiData.PmtItem;
import com.android.tv.tuner.data.PsipData.EitItem;
import com.android.tv.tuner.data.PsipData.VctItem;
-import com.android.tv.tuner.data.Track.AtscAudioTrack;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
+import com.android.tv.tuner.data.nano.Track.AtscAudioTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
import com.android.tv.tuner.data.TunerChannel;
import com.android.tv.tuner.source.FileTsStreamer;
import com.android.tv.tuner.ts.TsParser;
diff --git a/src/com/android/tv/tuner/tvinput/TunerSession.java b/src/com/android/tv/tuner/tvinput/TunerSession.java
index abfd2b30..5c61402e 100644
--- a/src/com/android/tv/tuner/tvinput/TunerSession.java
+++ b/src/com/android/tv/tuner/tvinput/TunerSession.java
@@ -41,7 +41,7 @@ import com.android.tv.tuner.R;
import com.android.tv.tuner.cc.CaptionLayout;
import com.android.tv.tuner.cc.CaptionTrackRenderer;
import com.android.tv.tuner.data.Cea708Data.CaptionEvent;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
import com.android.tv.tuner.exoplayer.buffer.BufferManager;
import com.android.tv.tuner.data.TunerChannel;
import com.android.tv.tuner.util.GlobalSettingsUtils;
diff --git a/src/com/android/tv/tuner/tvinput/TunerSessionWorker.java b/src/com/android/tv/tuner/tvinput/TunerSessionWorker.java
index c0a613a4..5230298e 100644
--- a/src/com/android/tv/tuner/tvinput/TunerSessionWorker.java
+++ b/src/com/android/tv/tuner/tvinput/TunerSessionWorker.java
@@ -47,12 +47,12 @@ import com.android.tv.common.SoftPreconditions;
import com.android.tv.common.TvContentRatingCache;
import com.android.tv.tuner.TunerPreferences;
import com.android.tv.tuner.data.Cea708Data;
-import com.android.tv.tuner.data.Channel;
import com.android.tv.tuner.data.PsipData.EitItem;
import com.android.tv.tuner.data.PsipData.TvTracksInterface;
-import com.android.tv.tuner.data.Track.AtscAudioTrack;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
import com.android.tv.tuner.data.TunerChannel;
+import com.android.tv.tuner.data.nano.Channel;
+import com.android.tv.tuner.data.nano.Track.AtscAudioTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
import com.android.tv.tuner.exoplayer.MpegTsRendererBuilder;
import com.android.tv.tuner.exoplayer.buffer.BufferManager;
import com.android.tv.tuner.exoplayer.buffer.DvrStorageManager;
diff --git a/usbtuner-res/values-az-rAZ/strings.xml b/usbtuner-res/values-az/strings.xml
index f5305817..f5305817 100644
--- a/usbtuner-res/values-az-rAZ/strings.xml
+++ b/usbtuner-res/values-az/strings.xml
diff --git a/usbtuner-res/values-bn-rBD/strings.xml b/usbtuner-res/values-bn/strings.xml
index 236e2d96..236e2d96 100644
--- a/usbtuner-res/values-bn-rBD/strings.xml
+++ b/usbtuner-res/values-bn/strings.xml
diff --git a/usbtuner-res/values-et-rEE/strings.xml b/usbtuner-res/values-et/strings.xml
index 70cb238a..70cb238a 100644
--- a/usbtuner-res/values-et-rEE/strings.xml
+++ b/usbtuner-res/values-et/strings.xml
diff --git a/usbtuner-res/values-eu-rES/strings.xml b/usbtuner-res/values-eu/strings.xml
index a0d456eb..a0d456eb 100644
--- a/usbtuner-res/values-eu-rES/strings.xml
+++ b/usbtuner-res/values-eu/strings.xml
diff --git a/usbtuner-res/values-gl-rES/strings.xml b/usbtuner-res/values-gl/strings.xml
index 58c14605..58c14605 100644
--- a/usbtuner-res/values-gl-rES/strings.xml
+++ b/usbtuner-res/values-gl/strings.xml
diff --git a/usbtuner-res/values-hy-rAM/strings.xml b/usbtuner-res/values-hy/strings.xml
index a8e33eac..a8e33eac 100644
--- a/usbtuner-res/values-hy-rAM/strings.xml
+++ b/usbtuner-res/values-hy/strings.xml
diff --git a/usbtuner-res/values-is-rIS/strings.xml b/usbtuner-res/values-is/strings.xml
index f63d9810..f63d9810 100644
--- a/usbtuner-res/values-is-rIS/strings.xml
+++ b/usbtuner-res/values-is/strings.xml
diff --git a/usbtuner-res/values-ka-rGE/strings.xml b/usbtuner-res/values-ka/strings.xml
index e09428d7..e09428d7 100644
--- a/usbtuner-res/values-ka-rGE/strings.xml
+++ b/usbtuner-res/values-ka/strings.xml
diff --git a/usbtuner-res/values-kk-rKZ/strings.xml b/usbtuner-res/values-kk/strings.xml
index 3c2ba4f3..3c2ba4f3 100644
--- a/usbtuner-res/values-kk-rKZ/strings.xml
+++ b/usbtuner-res/values-kk/strings.xml
diff --git a/usbtuner-res/values-km-rKH/strings.xml b/usbtuner-res/values-km/strings.xml
index 904f3e5d..904f3e5d 100644
--- a/usbtuner-res/values-km-rKH/strings.xml
+++ b/usbtuner-res/values-km/strings.xml
diff --git a/usbtuner-res/values-kn-rIN/strings.xml b/usbtuner-res/values-kn/strings.xml
index fb97ae2b..fb97ae2b 100644
--- a/usbtuner-res/values-kn-rIN/strings.xml
+++ b/usbtuner-res/values-kn/strings.xml
diff --git a/usbtuner-res/values-ky-rKG/strings.xml b/usbtuner-res/values-ky/strings.xml
index 39e9d1df..39e9d1df 100644
--- a/usbtuner-res/values-ky-rKG/strings.xml
+++ b/usbtuner-res/values-ky/strings.xml
diff --git a/usbtuner-res/values-lo-rLA/strings.xml b/usbtuner-res/values-lo/strings.xml
index 954baabe..954baabe 100644
--- a/usbtuner-res/values-lo-rLA/strings.xml
+++ b/usbtuner-res/values-lo/strings.xml
diff --git a/usbtuner-res/values-mk-rMK/strings.xml b/usbtuner-res/values-mk/strings.xml
index fb2e71e7..fb2e71e7 100644
--- a/usbtuner-res/values-mk-rMK/strings.xml
+++ b/usbtuner-res/values-mk/strings.xml
diff --git a/usbtuner-res/values-ml-rIN/strings.xml b/usbtuner-res/values-ml/strings.xml
index d025ec7b..d025ec7b 100644
--- a/usbtuner-res/values-ml-rIN/strings.xml
+++ b/usbtuner-res/values-ml/strings.xml
diff --git a/usbtuner-res/values-mn-rMN/strings.xml b/usbtuner-res/values-mn/strings.xml
index 51f7a8dd..51f7a8dd 100644
--- a/usbtuner-res/values-mn-rMN/strings.xml
+++ b/usbtuner-res/values-mn/strings.xml
diff --git a/usbtuner-res/values-mr-rIN/strings.xml b/usbtuner-res/values-mr/strings.xml
index 2ea242f1..2ea242f1 100644
--- a/usbtuner-res/values-mr-rIN/strings.xml
+++ b/usbtuner-res/values-mr/strings.xml
diff --git a/usbtuner-res/values-ms-rMY/strings.xml b/usbtuner-res/values-ms/strings.xml
index 578e8ae5..578e8ae5 100644
--- a/usbtuner-res/values-ms-rMY/strings.xml
+++ b/usbtuner-res/values-ms/strings.xml
diff --git a/usbtuner-res/values-my-rMM/strings.xml b/usbtuner-res/values-my/strings.xml
index 56a29e51..56a29e51 100644
--- a/usbtuner-res/values-my-rMM/strings.xml
+++ b/usbtuner-res/values-my/strings.xml
diff --git a/usbtuner-res/values-ne-rNP/strings.xml b/usbtuner-res/values-ne/strings.xml
index 07d68e2c..07d68e2c 100644
--- a/usbtuner-res/values-ne-rNP/strings.xml
+++ b/usbtuner-res/values-ne/strings.xml
diff --git a/usbtuner-res/values-si-rLK/strings.xml b/usbtuner-res/values-si/strings.xml
index a792b2c0..a792b2c0 100644
--- a/usbtuner-res/values-si-rLK/strings.xml
+++ b/usbtuner-res/values-si/strings.xml
diff --git a/usbtuner-res/values-ta-rIN/strings.xml b/usbtuner-res/values-ta/strings.xml
index dd09420d..dd09420d 100644
--- a/usbtuner-res/values-ta-rIN/strings.xml
+++ b/usbtuner-res/values-ta/strings.xml
diff --git a/usbtuner-res/values-te-rIN/strings.xml b/usbtuner-res/values-te/strings.xml
index a80bd1c7..a80bd1c7 100644
--- a/usbtuner-res/values-te-rIN/strings.xml
+++ b/usbtuner-res/values-te/strings.xml
diff --git a/usbtuner-res/values-ur-rPK/strings.xml b/usbtuner-res/values-ur/strings.xml
index 68c85d05..68c85d05 100644
--- a/usbtuner-res/values-ur-rPK/strings.xml
+++ b/usbtuner-res/values-ur/strings.xml
diff --git a/usbtuner-res/values-uz-rUZ/strings.xml b/usbtuner-res/values-uz/strings.xml
index 9aefd57b..9aefd57b 100644
--- a/usbtuner-res/values-uz-rUZ/strings.xml
+++ b/usbtuner-res/values-uz/strings.xml