resolved conflicts for merge of 20c7965d to gingerbread-plus-aosp
Change-Id: I43d6738ed22048b6cb80330d2a6a8abc994110b0
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 328579f..0a02fc4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Zobrazovač HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Získat přístup k obsahu DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Umožní aplikaci získat přístup k obsahu chráněnému technologií DRM."</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 63c1d92..a4f91d3 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML-fremviser"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Få adgang til DRM-indhold."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Tillader, at et program får adgang til DRM-beskyttet indhold."</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2dae62d..c00577e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML-Anzeige"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Zugriff auf DRM-Content"</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Eine Anwendung kann auf DRM-geschützten Content zugreifen."</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b7da4cb..bc3d971 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Πρόγραμμα προβολής HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Πρόσβαση σε περιεχόμενο DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Επιτρέπει στην εφαρμογή την πρόσβαση σε περιεχόμενο προστατευμένο με DRM."</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 45e17b9..4127b38 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Visualizador de HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Acceder al contenido de DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Permite a la aplicación acceder al contenido protegido por DRM."</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2067360..025272d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Visor de HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Acceso a contenido con protección DRM"</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Permite que la aplicación acceda a contenido protegido por DRM."</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5c36efe..709f9af 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Visionneuse HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Accès au contenu DRM"</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Autorise l\'application à accéder à du contenu protégé par DRM."</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e34a682..44bb54c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Visualizzatore HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Accedere a contenuti DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Consente l\'accesso dell\'applicazione a contenuti protetti tramite DRM."</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e9a11cb..9ff2114 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTMLビューア"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"DRMコンテンツにアクセスする。"</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"DRM保護されているコンテンツへのアクセスをアプリケーションに許可します。"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cec2718..8eb87e9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML 뷰어"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"DRM 콘텐츠 사용"</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"애플리케이션이 DRM으로 보호된 콘텐츠를 사용할 수 있도록 허용합니다."</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 432ba0c..33ec5cd 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML-leser"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Få tilgang til DRM-innhold"</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Gir programmer tilgang til DRM-beskyttet innhold."</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c31019d..f0eec39 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML-viewer"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"DRM-inhoud openen."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Hiermee krijgt de toepassing toegang tot inhoud met DRM-bescherming."</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ee15747..d49c19d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Przeglądarka HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Dostęp do treści chronionej za pomocą systemu DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Zezwala aplikacji na dostęp do treści chronionej za pomocą systemu DRM."</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e6ddf21..4127b38 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Visualizador de HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Aceder a conteúdo DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Permite que a aplicação aceda a conteúdo protegido por DRM."</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index bc6093e..99b0ae8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Leitor de HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Acessar conteúdo DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Permite que o aplicativo acesse conteúdo protegido por DRM."</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 907d66d..3f499af 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Средство просмотра HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Доступ к содержанию DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Предоставляет приложению доступ к содержанию, защищенному DRM."</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0cac6a1..3fba599 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML Görüntüleyici"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"DRM içeriğine erişin."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Uygulamaya DRM korumalı içeriğe erişme izni verir."</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3836729..4cb7233 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML 查看器"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"访问 DRM 内容。"</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"允许应用程序访问受 DRM 保护的内容。"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index eb11f2c..d478f99 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML 檢視器"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"存取 DRM 內容。"</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"允許應用程式存取 DRM 保護內容。"</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e7db77e..0c52618 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,12 +17,5 @@
<resources>
<!-- Title of the HTML Viewer activity. -->
<string name="app_label">HTML Viewer</string>
-
- <!-- Title of the permission that allows access to DRM content -->
- <string name="permlab_accessDrm">Access DRM content.</string>
-
- <!-- Description of the permission that allows access to DRM content -->
- <string name="permdesc_accessDrm">Allows application to access
- DRM-protected content.</string>
</resources>
