diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-07-08 17:59:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-08 17:59:57 -0700 |
| commit | 73a20e45ada6e385aa39b93882d0981b89e5ac8e (patch) | |
| tree | 2b20d56a8083044b16451ce25bda51fc1d959d59 | |
| parent | 25f3624bc034e3e85d2d6f82393ebf89752341a7 (diff) | |
| parent | 34ca7c66722c94c7b5e41ab8967135c3584aba9c (diff) | |
| download | Calendar-73a20e45ada6e385aa39b93882d0981b89e5ac8e.tar.gz | |
Merge "AOSP/Calendar - Fix improperly formatted resource string in Calendar." am: 237937c22b
am: 34ca7c6672
Change-Id: Ibc90b19b6f7cb50411dea99b844fa4930eccdb68
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index caec61b5..8c6cf10d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -41,7 +41,7 @@ <string name="tomorrow_at_time_fmt">"Tomorrow at <xliff:g id="time_interval">%s</xliff:g>"</string> <!-- Format string for a date and time description. For ex: "April 19, 2012, 3:00pm - 4:00pm" [CHAR LIMIT=NONE] --> - <string name="date_time_fmt">"<xliff:g id="date">%s</xliff:g>, <xliff:g id="time_interval">%s</xliff:g>"</string> + <string name="date_time_fmt">"<xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>"</string> <!-- Some events repeat daily, weekly, monthly, or yearly. This is the label for all the choices about how often an event repeats (including the choice |