diff options
| author | Xin Li <delphij@google.com> | 2017-11-06 13:22:59 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2017-11-06 13:22:59 -0800 |
| commit | 7bee53ef04dd26cd62b744d918dde279c6b4123b (patch) | |
| tree | 43f30baaccfb5aab2a6aaa6159e7e951792e92e2 | |
| parent | 5c671e5e5f26658d95ff28a4a8ca79d33a84a12e (diff) | |
| parent | b7130f2815829f0f77accaa47edf17c62185060f (diff) | |
| download | TvProvider-7bee53ef04dd26cd62b744d918dde279c6b4123b.tar.gz | |
resolve merge conflicts of b7130f2 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6068e16cd58068df6e2856e0ca89086f2f9f6d02
| -rw-r--r-- | res/values-de/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index bbde1c6..57afef7 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -17,6 +17,6 @@ <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="7454398782183407432">"TV Storage"</string> - <string name="permlab_readTvListings" msgid="5272001606068276291">"Alle TV-Programmeinträge lesen"</string> + <string name="permlab_readTvListings" msgid="5272001606068276291">"alle TV-Programmeinträge lesen"</string> <string name="permdesc_readTvListings" msgid="1165157606059567535">"Alle auf deinem Gerät verfügbaren TV-Programmeinträge lesen"</string> </resources> |