aadfbbc18b
Conflicts: res/values/strings.xml res/xml/preferences.xml |
||
---|---|---|
.. | ||
arrays.xml | ||
attrs.xml | ||
resources.xml | ||
strings.xml | ||
style.xml |
aadfbbc18b
Conflicts: res/values/strings.xml res/xml/preferences.xml |
||
---|---|---|
.. | ||
arrays.xml | ||
attrs.xml | ||
resources.xml | ||
strings.xml | ||
style.xml |