So
Merge branch 'cm-12.0' of https://github.com/CRXTeam/android_device_sony_eagle into cm-12.0

Conflicts:
	localcm12.xml