Got it to work
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/com/rdio/android/api/example/ExampleActivity.java