Add Device Settings, remove Galaxy Parts
turn off charging LED (TEMP)
Merge pull request #17 from pcarenza/jb-mr1

Add Device Settings, remove Galaxy Parts
Merge branch 'cm-10.1' of https://github.com/razrqcom-dev-team/android_device_motorola_msm8960-common into jb-mr1

Conflicts:
	msm8960.mk
Revert "Fix error"

This reverts commit 0322d5e9236455bb462b17b8b517bb34a276ccb4.
Merge pull request #18 from pcarenza/jb-mr1

update device
Merge branch 'cm-10.1' of https://github.com/razrqcom-dev-team/android_device_motorola_msm8960-common into HEAD
Merge branch 'cm-10.1' of https://github.com/razrqcom-dev-team/android_device_motorola_msm8960-common into jb-mr1
Merge pull request #19 from pcarenza/jb-mr1

device updates for msm8960
Merge branch 'cm-10.1' of https://github.com/razrqcom-dev-team/android_device_motorola_msm8960-common into HEAD
Merge branch 'cm-10.1' of https://github.com/razrqcom-dev-team/android_device_motorola_msm8960-common into HEAD
fix modified composition settings - no longer needed
Merge pull request #20 from pcarenza/jb-mr1

Jb mr1
make battery led user-switchable
make battery led user-switchable

allow device to control led while charging

change user editable value to correlate to romsettings led switch prop

insert ROMControl overlay
Merge branch 'jb-mr1' of https://github.com/pcarenza/android_device_motorola_msm8960-common into jb-mr1

Conflicts:
	modules/liblight/lights.c
Merge pull request #21 from pcarenza/jb-mr1

Jb mr1
Revert "Remove unused media properties"

This reverts commit 229c9994637a6f817c992c5876515c619be9797d.
Revert "Enable tunnel audio"

This reverts commit 77c8d84b1dd46c5c177f0f8cd600a59a8bcfb2e4.
Merge branch 'cm-10.1' of https://github.com/razrqcom-dev-team/android_device_motorola_msm8960-common into HEAD

Conflicts:
	BoardConfigCommon.mk
Merge pull request #22 from pcarenza/jb-mr1

Jb mr1