When wifi wants ASCII lowercasing, it needs to ask for it.

http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Ibf25d0bbc76015cf8353ec01ab2b743cbc2bde67

Conflicts:

	wifi/java/android/net/wifi/WifiStateMachine.java

If frameworks wants ASCII casing, it should explicity ask for it.

http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4

If graphics wants ASCII lowercasing, it needs to ask for it.

http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: I13c106985302335dbb15bb9176d35ec6b4546d4e

If media wants ASCII lowercasing, it needs to ask for it.

http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption,
and use toLowerCase(Locale.getDefault()) if you want the user's locale's
casing rules for human consumption.

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
halo hide: optimizing

Change-Id: I4f77e9fe03cbbae4c4e32822beb286db97ea20a7
some more halo animation improvements

Change-Id: I12dc9f9bdb956508ab8a048553aa1a1566af1198
also allow custom background for optimus4 lockscreen

Change-Id: Ie3fd2a9d273f64eb80a572ccd0d419107f3f63f3
Merge "When wifi wants ASCII lowercasing, it needs to ask for it." into cm-10.2
option to use omptimus4 background color as lockscreen background color
more improved halo hide

Change-Id: I3a0c6684227c8d9df0f13b43c9718f2cc60cbe54
Thanks to kufikugel / SlimRoms for knowing how to.

[log]

Change-Id: I778e10f2b4a30e281eec4deb96980bad192b2f32

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_frameworks_base into cm-10.2
halo hide: fix wrong type of variable..

Change-Id: I362ad9c97dfa1b0a330d65dcbc1c1e5933ee98d1
Move 'start music player on headset connection' option out of DSPManager
(1/2)

This option isn't related to DSP manager at all, so it shouldn't be
implemented there.

Change-Id: Ibe35c9739ccb4f4587ee71f514d16fb317bf4034
Use max 8 QS tiles in landscape, not 10

Change-Id: I8283311a1cf7210bd299c55b5188cd6a294746c6
Revert "platform: Remove mapping of android.permission.CAMERA to camera group"

This reverts commit de1e404d570dd03529c1e4e8ffbbce432e8be4a2.

Change-Id: Ibc62cb0fc9992e6676ed2af9f1718d28257f65d0
Merge "Revert "platform: Remove mapping of android.permission.CAMERA to camera group"" into cm-10.2
Merge "Move 'start music player on headset connection' option out of DSPManager (1/2)" into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_frameworks_base into cm-10.2
Merge branch 'upstream/cm-10.2'