Update media_profiles.xml
Merge https://github.com/STS-Dev-Team/android_device_motorola_edison into cm-10.2
override gps.conf

Change-Id: Ie4349bed8b22a121abb88b2e8f6d4fb463fab21a
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2

Conflicts:
	device.mk
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2
Merge branch 'cm-10.2' of https://github.com/Atrix2-Dev-Team/android_device_motorola_edison into cm-10.2
remove .bak
fix merge derp..?
update init.target.rc

Change-Id: Ib24ea78ff76e6baee5e41972f3fee38b31eeba7f
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2
Remove gsm.mk

Change-Id: I04b8a8ebbc8d7addbcb93a1e285b63c52e64a37d
Merge branch 'cm-11.0' of https://github.com/Atrix2-Dev-Team/android_device_motorola_edison into cm-11.0
fix manufacturer name

Change-Id: If111a6e6a32851ad1fd4056e3c69d26746d21fbe
overlay: Add mms info to framework

Change-Id: I9630160d43e7ef012d18fe60493480a414b6e705
Remove gsm.mk

Change-Id: I04b8a8ebbc8d7addbcb93a1e285b63c52e64a37d
fix manufacturer name

Change-Id: If111a6e6a32851ad1fd4056e3c69d26746d21fbe
overlay: Add mms info to framework

Change-Id: I9630160d43e7ef012d18fe60493480a414b6e705