邮箱右侧图片
Merge branch 'chende' of https://github.com/chainton/pdm-client.git into
chende
添加关联设备
Merge branch 'chende'

Conflicts:
	res/values/strings.xml
关联设备
Merge branch 'chende'

Conflicts:
	res/values/strings.xml
Merge branch 'chenyan'

Conflicts:
	AndroidManifest.xml
增加同步音乐的类
修改