Network traffic settings (2/2)
fix Status Bar signal to point to graphical speedometer
Merge branch 'jb-mr1' of https://github.com/pcarenza/packages_apps_ROMSettings into jb-mr1
Merge "RC: Ribbons fix custom selection for long press/swipe" into jb-mr1
Conflicts:
	src/com/aokp/romcontrol/fragments/RibbonTargets.java
Merge branch 'jb-mr1' of https://github.com/pcarenza/packages_apps_ROMSettings into jb-mr1
Merge pull request #7 from pcarenza/jb-mr1

jb-mr1