Port: Settings/Added ADB over WiFi QuickSettings Tile
Merge branch 'jbam10' of github.com:BAM-Team/android_packages_apps_Settings into jbam10
PrivacyGuard : Reimplement to use appops

Re-implement privacy guard to use appops

Change-Id: Id97b6ecf8d4c844d3496adc71eeaba7ea050ce1d

Conflicts:

	src/com/android/settings/cyanogenmod/privacyguard/PrivacyGuardManager.java
sounds: add extra gain option

ported from sg3 device settings, tested on jfltevzw

Change-Id: I448c934aef8fc8e92196994c4bd3dd545838b802

Conflicts:

	res/values/cm_strings.xml
Revert "PrivacyGuard : Reimplement to use appops"

This reverts commit 6f547e1a20a6dee033ee9cc7144ff933a2defd77.
Revert "Fix coding style."

This reverts commit 42b1727b5268363659ea1d8843452a33dc1f7c7b.

Change-Id: Ie8feb9dba61ce5cc263e4b09e063e0cd00ecdbe9
Revert "Bluetooth : Remove out of range devices after ScanComplete"

Reverting this change as it has some side effects and after
removing this gerrit the behavior is like commercial phone.

This reverts commit 2ba08f2d7efbfe7c0b0080f0e9a63e56d15695e7.

Change-Id: Ice89ccb6250f55f4e0235df27a3ecea64260b488
Add instance save/restore for hardware tunables.

Needed to correctly handle e.g. screen rotation.

Change-Id: I6c4ba9aa24c9545037f949a68654428457de46f5
Fix NPE when cancelling the shortcut picker.

Change-Id: Id58410b5d5e99fe8361d21cec6ee3d15f382256c
Translate of tabs in settings

I hope so that are correct strings for tabs.
Merge pull request #1 from kwiateusz/patch-1

Translate of tabs in settings
DAMNIT
Merge branch 'jbam10' of github.com:BAM-Team/android_packages_apps_Settings into jbam10
QuickSettings: Fix NPE
PAC-Settings: Custom System Animations. Original Work from
Steve K. Spear AOKP 2/2

Allows setting of some system animations.
Current List:
Activity Open
Activity Close
Task Open
Task Close
Task Move to front
Task Move to back
Window Open
Window Close
Window Intra Open
Window Intra Close
Duration Control
Prevent overridePendingTransition option

Change-Id: I525e04c3e5af484fb5a4bea0e4376f3dda4af085
Fix NPE when cancelling the shortcut picker.

Change-Id: Id58410b5d5e99fe8361d21cec6ee3d15f382256c
Merge commit '4f99491' into jbam10
Settings: Port HALO Mods (2/2)

Signed-off-by: iGio90 <giovanni.rocca.90@gmail.com>
Derp
derp