keyguard: fix-fix layout for sw320dp devices

Default values need to be defined in sw360dp or larger devices will
pick up sw320dp values automatically.

On the maguro device the keyguard isn't properly centered.

- Before http://review.cyanogenmod.org/54758:
    http://i.imgur.com/F6sokhA.jpg
- After http://review.cyanogenmod.org/54758:
    http://i.imgur.com/OdTkZLL.jpg
- With this commit:
    http://i.imgur.com/TThq9da.jpg

Change-Id: Idcc29ec79a12e61b26d2ad5070468e70a8ef39df
National roaming info for yesss! in Austria

Change-Id: I930198d3cb311b23752a8c2f54852ebd48d65b86
Rollback Bluetooth changes for now.

 * Lots of issues being reported with various devices and the last batch
   of Bluetooth changes. Roll back until further testing.

Revert "Bluetooth: Changes for LPP and extended LE scan"

This reverts commit cf7b8680781672750e8c2c35752d061a1437b371.

Revert "OBEX: Reduce Obex MTU size for A2DP or SCO concurrency"

This reverts commit 703b0d22363ca97ebb7726b540bacc91de5895b8.

Revert "Bluetooth: HID: Add support for HID Device Role"

This reverts commit 17221101b567561bff903ca9e1e4ade083a44735.
Merge "National roaming info for yesss! in Austria" into cm-11.0
Merge "keyguard: fix-fix layout for sw320dp devices" into cm-11.0
PhoneWindowManager: fix navbar behavior in expanded mode after 4.4.2 merge.

Change-Id: I00f814db6c3800b8eb1cf20004ecdfb8d1ee7036
Fix indention.

Change-Id: Ibbac20f4b8d14aaf753c463293bc4caa6c64cb91
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_frameworks_base into CyanogenMod-cm-11.0

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

	modified:   Android.mk
	modified:   core/java/android/bluetooth/BluetoothAdapter.java
	deleted:    core/java/android/bluetooth/BluetoothHidDevice.java
	deleted:    core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.aidl
	deleted:    core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.java
	deleted:    core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.aidl
	deleted:    core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.java
	deleted:    core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.aidl
	deleted:    core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java
	deleted:    core/java/android/bluetooth/BluetoothHidDeviceCallback.java
	deleted:    core/java/android/bluetooth/BluetoothLEServiceUuid.aidl
	deleted:    core/java/android/bluetooth/BluetoothLEServiceUuid.java
	deleted:    core/java/android/bluetooth/BluetoothLwPwrProximityMonitor.java
	modified:   core/java/android/bluetooth/BluetoothProfile.java
	deleted:    core/java/android/bluetooth/BluetoothRssiMonitorCallback.java
	deleted:    core/java/android/bluetooth/IBluetoothHidDevice.aidl
	deleted:    core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl
	modified:   core/java/android/bluetooth/IBluetoothManager.aidl
	deleted:    core/java/android/bluetooth/IQBluetooth.aidl
	deleted:    core/java/android/bluetooth/IQBluetoothAdapterCallback.aidl
	deleted:    core/java/android/bluetooth/IQBluetoothManagerCallback.aidl
	deleted:    core/java/android/bluetooth/QBluetoothAdapter.java
	new file:   core/res/res/values-mcc232-mnc12/config.xml
	modified:   obex/javax/obex/ClientSession.java
	modified:   obex/javax/obex/ObexHelper.java
	modified:   packages/Keyguard/res/values-sw360dp/dimens.xml
	modified:   packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java
	modified:   policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	modified:   services/java/com/android/server/BluetoothManagerService.java