fc42b73ba5
Conflicts: res/values-fr/strings.xml res/values/strings.xml |
||
---|---|---|
.. | ||
arrays.xml | ||
attrs.xml | ||
resources.xml | ||
strings.xml | ||
style.xml |
fc42b73ba5
Conflicts: res/values-fr/strings.xml res/values/strings.xml |
||
---|---|---|
.. | ||
arrays.xml | ||
attrs.xml | ||
resources.xml | ||
strings.xml | ||
style.xml |