Corrected commit Iaa7192e64cc2308fd42a75891c134190a93b4e4b

Change-Id: I9f6d9289b8e76068cb7fbef6d7d6a3c55512b20e
Colour picker text input field: wrong content due to alpha channel.

The field was, effectively, showing AARRGG instead of RRGGBB due to
the alpha component being non-zero. This change fixes that in a
generic way which allows for alpha channel handling even though I see
no use for the alpha channel for the notification light.

Change-Id: I5b71340f3b644c6f6b305dc66d1285cc77427bf5
Small change to battery lights for dummies like me

Change-Id: Ib92ade24ea8680deac802b1e5df237dd6d0b0403
Revert "Patch Set 2/2: Add an "Automatically Connect" option for WiFi networks"

This reverts commit c5772b09321e200b1c8ae6c5efd8cc6360ca148c

Change-Id: Ia80988ef38d3e0c4d180bb616a25eb773c6b8206

Conflicts:
	src/com/android/settings/wifi/WifiConfigController.java
Merge remote-tracking branch 'slim/jb4.2' into mirage