Update of some Simplified Chinese translations
Merge pull request #40 from nazunamoe/fix

some Korean fix
Merge pull request #1 from XYAOSP/jellybean

Jellybean
Update of some Simplified Chinese translations
Merge pull request #41 from oubeichen/jellybean

Update of some Simplified Chinese translations
Bye some features! :D
Add .75x animation scale
Fix spacing
Make it more organized and proper
Merge branch 'jellybean' of https://github.com/XYAOSP/packages_apps_Settings into jellybean
Add 60 minute dreams timeout and add 10 process process limiter options, and changed a word
-_- .. more spacing fixes
Update of some French Translations
Hardcode Pimp My ROM into Settings. Thanks to AndroGuide.fr for permission on allowing this. *Please not this is just a test, if it breaks the build or doesnt work, I will revert it right away*
Revert "Hardcode Pimp My ROM into Settings. Thanks to AndroGuide.fr for permission on allowing this. *Please not this is just a test, if it breaks the build or doesnt work, I will revert it right away*"

This reverts commit 130474d4f34f19ba5ccb69929ad5a5ea93a9c62e.
WLAN configuration (static address): reject IPv6 addresses.

Without this, entering an IPv6 address as the interface address (or possibly
also others, such as gateway address) will, on connection to that WLAN,
trigger an uncaught exception:

*** FATAL EXCEPTION IN SYSTEM PROCESS: WifiStateMachine
java.lang.IllegalArgumentException: command '59 interface setcfg wlan0 2001:db8::ffff 24 up' failed with '501 59 Flag unsupported'
	at com.android.server.NetworkManagementService.setInterfaceConfig(NetworkManagementService.java:546)
	at android.net.wifi.WifiStateMachine$ObtainingIpState.enter(WifiStateMachine.java:3449)
	at com.android.internal.util.StateMachine$SmHandler.invokeEnterMethods(StateMachine.java:958)
[etc.]

followed by a restart of the UI then another connection attempt. So long as
the misconfigured-for AP is present (and preferred?), this will continue to
happen.

Change-Id: I524480339c37ad079fd21d90a6b1fc5864089cb5
Settings: Add Permissions Management to AOKP [1/4]

So that user can easily access the Permissions Management app via settings.

Change-Id: I4f30389c3f8c9f05c0279c60ed819a65aa0d69df
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
Hardcode my CPU Guide into Settings (Testing this out, will revert this if it causes build errors or user issues)
Resources shouldnt of been there
Accidentally changed performance id in settings_headers