Bring in the LogoActivity

Change-Id: If0376fc301b84e2f40e8111a2ac89ed7d94827ee
RadioInfo: Update the network type listing

The dropdown for the preferred type in the INFO menu is outdated.
ril.h and RILConstants now go up to type 11, due to the addition of
the LTE combinations.
If a device has one of these new types set up as the default, going
into this menu causes a crash for com.android.phone, since it attempts
to use array position "type" without verifying if it is that long.

Change-Id: I82b204c027cdfd2d2fe84633b036c3a41fd8d60a
Adb over network (Settings part for Jellybean)

+ Display WiFi IP Address & Port as preference summary.

Note: adb_over_network were already pushed in 5555aae3

Change-Id: Ia05aa8f6281c9bdcb3d5e62566b103c38bc70b82
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Settings: Power widget settings cleanup

Patchset 2 - Switch to MultiSelectListPreference

Change-Id: Ie8e2920bd1ef7b7db6958a561dad742e25d97c8c
Adb over network, fix the ui

the previous commit was merged a bit too fast...
statusbar max notification number

Change-Id: Icc5418d1846ac25e0921666bb05767b3f741c8b3
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean
Settings : Fix mismatched dialog listener

Set listener on correct dialog

Change-Id: I0c05af859ad0e93ba6a1d3d395dc6c31e9949426
Fix NPE in InputMethodAndLanguageSettings

Commit 5555aae3 assumed mStatusBarImeSwitcher could never be null in
onResume().

Change-Id: I3bd5b7ecd9bfe9e1a69d553f70ecd3fc3d78c546
Merge remote-tracking branch 'remotes/cm/jellybean' into jellybean
Add intent for launching paranoid settings
wrong img

Change-Id: Id1028cdc1d729d69bb0b4a2a6891359dc817f114
probably fixes lockscreen-pattern layout issues

Change-Id: Ifebd1c018cb2431f9bd704451f351e657932675e
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Settings into jellybean

Conflicts:
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: I43b342c6b26ff929b413f43b4e1d9e6cc161c2fd
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Settings into jellybean
Add missing es_ES translations

patchset 2: fix typos

Change-Id: I85f364d3aee124ec29b279d4e46e634d5a285780
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Settings into jellybean
Revert "Add missing es_ES translations"

This reverts commit 03e5e10c9512656d59d62e9d858822c8a33c6fe1.
Add missing es_ES translations

patchset 2: fix typos
patchset 3: fixes

Change-Id: I85f364d3aee124ec29b279d4e46e634d5a285780
typos

Change-Id: I5063d6639422958fa3b203274a485bef7e16c1c7