关联设备
Merge branch 'chende'

Conflicts:
	res/values/strings.xml