Pie Toggle (1/2)
Merge commit '3e155c0aacc7466d1a1cd844ee84d8d151045ebb' into jb-mr1

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/Settings.java
Pie Toggle