807907cb9e
Conflicts: res/values/strings.xml src/com/fsck/k9/service/MailService.java |
||
---|---|---|
.. | ||
arrays.xml | ||
colors.xml | ||
constants.xml | ||
dimensions.xml | ||
ids.xml | ||
strings.xml | ||
styles.xml |
807907cb9e
Conflicts: res/values/strings.xml src/com/fsck/k9/service/MailService.java |
||
---|---|---|
.. | ||
arrays.xml | ||
colors.xml | ||
constants.xml | ||
dimensions.xml | ||
ids.xml | ||
strings.xml | ||
styles.xml |