Remove invalid menu entry in ToolBars menu.

Removed invalid menu entry in Toolbars menu that created an invalid entry @2131429843 that referred to Cyanogenmod.NavBar preference screen that does not exist.

Clicking this menu item would cause Settings to FC.

Change-Id: I81bff48deac2252353ec47342e7131215a25e13c
Revert "Remove invalid menu entry in ToolBars menu."

This reverts commit 0b8293ea786f6b7a3026d592d888fe97ea8f1c5b.
Merge pull request #12 from KBizzle/cm-10.1

Revert "Remove invalid menu entry in ToolBars menu."
Update ChangeLog.java
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
'Quicktile row option:set 3,4,5 tiles per row (1/2)'

Conflicts:

	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
Properly get rid of null string reference, without compromising TabletUI.
Settings menu cleanup

- Superuser header moved below Developer Options
- Having two performance options makes the menu clunky. So I took out
the CM one as the AOKP one offers more functionality over CM's one
- Moved toolbar settings to System

Compiled and works fine for me, looks much less cluttered as well.
https://www.dropbox.com/s/z6u1z7r0g799s5z/2013-03-24%2018.06.35.png
https://www.dropbox.com/s/x975o6l8nm3fmuf/2013-03-24%2018.06.45.png
Merge pull request #13 from IvanBrazza/cm-10.1

Settings menu cleanup
Quick Settings: Add Network mode tile (part 2 of 2)

This commit also inlcudes a bit of code cleanup and sets the
default tiles to AOSP defaults

Change-Id: I735878997a807450368641faad52ba4b5e8eadf5

Conflicts:

	res/values/strings.xml
	res/xml/quick_settings_panel_settings.xml
	src/com/android/settings/cyanogenmod/QuickSettings.java
	src/com/android/settings/cyanogenmod/QuickSettingsUtil.java
QuietHours Tile (2/2)

Allows user to toggle state of quiet hours

Change-Id: I9d3234b993d250a7d43683b51c1c3254aaec262f

Conflicts:

	res/values/strings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/cyanogenmod/QuickSettingsUtil.java
Merge pull request #14 from Nick0703/cm-10.1

Quick Settings update...(2/2)
merge latest pa changes

Change-Id: I24fa5a3975406b843091ae5ea35e79539180d1e3
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1