Minor cleanup.
intermediate commit (broken) so I can pull on desktop and test faster.
intermediate commit (broken) so I can pull on desktop and test faster.
Merge branch 'master' of github.com:frostwire/frostwire-android
Merge branch 'master' of github.com:frostwire/frostwire-android
Split 'common/' into commit '33077de85ad675ef8229b1be38917f118e8ec74d'

git-subtree-dir: common
git-subtree-mainline: 273b91eb27804ea23a58c72e97ddc35e35def5bf
git-subtree-split: 33077de85ad675ef8229b1be38917f118e8ec74d