Switch for hybrid settings

Signed-off-by: iceandfire <arhamjamal@gmail.com>
Merge branch 'jb-mr1' of https://github.com/pcarenza/platform_frameworks_base into HEAD
fix redundant line in settings for network traffic
Frameworks: a bit taste of android 4.3

most changes are under seems to be under the hood and are
not mergeable due that we have no code...... UI changes
are minor....but our lovely Roboto font is pimped up on the
new android version. So here we go

cheers

Change-Id: I139bcdeaefe5125ba8974fc88423c62d62b1b429