Merge branch 'jb-mr1' of git://github.com/Root-Box/frameworks_base into RootBox

Conflicts:
	core/res/res/values/config.xml
Revert "Add fm volume control"

This reverts commit d41d44ca50b64433b4e610eb0b3ac3d3a59803db.

Conflicts:
	core/res/res/values/config.xml
Add fm volume control

Change-Id: I8b3a10e3037c5bb3c7c044b86ddf9de5045d3e9d

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java