Integrate quite hours active period strings for JA translation

Change-Id: If9c195ecbf9d00f01108185bba1a75be7c115b39
Settings: Modify volume override summary for JA translation

Change-Id: Ia9a14def58c7c195ba5c5cf55983b8d33ec8b5a7
Remove lockscreen slide delay option (1/2)

Also enable these options for insecure lockscreen:
* Lock after timeout
* Power button instantly locks
* Owner info

Change-Id: I7737dc9cb1108f7d83b2cea3af9eb313767eb958
Cleanup lockscreen security settings

Since we moved lockscreen security settings to a separate fragment,
these changes we have initially made are not longer needed

Change-Id: Iac07850e974e9ea423fd8908ce1e134a9a2508ef
Remove 'More device settings' menu

Change-Id: I86cd84f6f6c408b26c04d92529e9a031c4fed1f7
Settings: Move Navigation buttons out of interface.

    http://imgur.com/iQi5xMg
    PS15: Move expanded desktop options to display.
    PS16: More cleanup.
    PS17: Remove whitespace.

Change-Id: I923d011cfa72a7c3fe26838032d00aaddf15a664
Settings: Fix lockscreen security strings

Change-Id: I9e35108cc7a0d65c80cc87ad9502c9ffdc29847a
Settings: Remove V+ pref if V+ isn't present

Change-Id: Ia202d00ebee95e99018e7b04ef284de0bf3f1e1c
Merge "Settings: Move Navigation buttons out of interface." into cm-11.0
Settings: Remove owner info from lockscreen options.

Change-Id: I5c1133e4aabe0c0c53472096bd8e7099690715c5
Merge "Settings: Remove V+ pref if V+ isn't present" into cm-11.0
Merge remote-tracking branch 'CM/cm-11.0' into cm-11.0-beta

Conflicts:
	AndroidManifest.xml
	res/xml/notification_drawer.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/LockscreenSecuritySettings.java
	src/com/android/settings/cyanogenmod/StatusBar.java
	src/com/android/settings/cyanogenmod/SystemUiSettings.java

Change-Id: If1b64cb076ce7a557e424cbf8816600e86a8c0fb