8337739ab4
Conflicts: src/de/danoeh/antennapod/activity/AudioplayerActivity.java src/de/danoeh/antennapod/activity/PreferenceActivity.java src/de/danoeh/antennapod/service/PlaybackService.java src/de/danoeh/antennapod/util/playback/PlaybackController.java |
||
---|---|---|
.. | ||
arrays.xml | ||
attrs.xml | ||
colors.xml | ||
dimens.xml | ||
ids.xml | ||
integers.xml | ||
strings.xml | ||
styles.xml |