Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
add STREAM_FM
Add fm volume control

Change-Id: I8b3a10e3037c5bb3c7c044b86ddf9de5045d3e9d
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1

Conflicts:
	services/java/com/android/server/usb/LegacyUsbDeviceManager.java
disable fm separate volume control by default
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1

Conflicts:
	core/res/res/values/arrays.xml
	core/res/res/values/strings.xml
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'mokee/jb-mr1_mkt' into HEAD

Conflicts:
	core/res/res/values/public.xml

Change-Id: I4fb19b12a1b601f49e8884929f5b71bfaab3847f