Merge branch 'jellybean' into jellybean-legacy
Lock screen: Hide initial pages hints feature (2/2)
-Port and adapt of hide hints for initial page AOKP's idea (Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>).
 Option stored in lock screen settings.
-Moved last brightness strings in brightness section and fixed some code alignment.
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
Update Halo notificactions
Update PT-BR translations

The entire translation is a mess. I'm forking it to completely rebase it.
HALO: Option to pause the underlying app (2/2)

- adds an option to pause the active app when using HALO
- this is enabled by default for devices with low memory
- (currently: <640MB RAM available to the kernel)
Merge pull request #17 from tonyp/jellybean

HALO: Option to pause the underlying app (2/2)
Merge pull request #14 from ajtudela/patch-1

Spanish translations
Update strings.xml

Fix some redundant/confusing strings
Update strings.xml

User doesn't needs to know this. I think
Some string fixes

...And spanish translations
Add missing string

Derp, thanks BigBrother1984 for spotting this one
Merge pull request #15 from gafanhotz/patch-1

Update PT-BR translations
NFC Polling Mode (2/3)
Signed-off-by: Jubakuba <Jubakuba@gmail.com>
Signed-off-by: sethyx <sethyx@gmail.com>
NFC: better code line - Thanks @D4rKn3sSyS
This is a big derp :)
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
First half of italian translations
Update README.md
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy