Wrong referring to the resource - id/android:id

We were referring to the resource defined as
@+android:id with R.id. which is wrong. This
fix changes the @+android:id/ to @+id/

Change-Id: Ifdca7347bff31311c9c07aecdb110946e4a239ed
Spanish translation for increasing ringtone

Also clean up a bit strings and organize structure

Change-Id: I8777a6a700c9ae2f0eb3ab2d9be2c20034c6d40c
Merge "Wrong referring to the resource - id/android:id" into kitkat
[3/3] Settings: Add AOSP Dialer check

Disable increasing ringtone option if Google dialer is used

Change-Id: I46a129e24bda51ffb9aa0d39d203523b9e00ef10
Fix elapsed time formatting.

We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.

Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
Fix crash by removing "omni_features" codes from AdditionalSettings
settings: performance icons

Change-Id: I612d1d1a94198140fedbb2f2713f56d01ccb08c3
1Settings: fix NPE with null check on NFC adapter

Verifies the adapter is not null before dereferencing it and log and error if so

PS:
- fix codestyle and rebase

Change-Id: Id2a34c4698a97476bee9b78cb0ac7b980d1595cf
Bluetooth: GAP: Avoid adding device to cached device list

Change will ensure that devices will not be added to the cached
device list if profile connection state is STATE_DISCONNECTED
or STATE_DISCONNECTING. Otherwise, devices will be added to cached
list and while inquring device will not be listed in available
device list.

CRs-Fixed: 586975
Change-Id: I60bc01c0f2cb5ea87f3c633bcec2f04c90939d67
Bluetooth: HID: Use proper values of connection status

This patch fixes issue in retrieving correct connection status when
more than one hid device was connected to DUT. In such situation
current implementation was sending STATE_DISCONNECTED as connection
state because of wrong check of matching device as 1st device in
connected device list. Instead of this now actual connection state
device is retrieved from HidService.

Change-Id: I2c766e9fc6eb9e97c3745016e38fa5c374c16539
CRs-Fixed: 593065
Initial Italian translation

This is the initial Italian translation for Paranoid Android 4+.

Change-Id: I1470c90bef61384a321564b0db7f535335d1ec8b
[1/2] Setting: Lockscreen maximized widgets

      Enable lockscreen widgets to be expanded by default.

      PA modifications to commit:
          Allow for long press unlock.
          Enable checkbox only if "Enable Widgets" is selected
          Remove preference is device is a tablet (already expanded)

PS2: Actually remove preference from tablets
PS3: Show option in all security categories
     (credit Cristiano Matos)
PS4: Rebase

Change-Id: I3d52b752415f48e5468db0804be5c2ff93a71e31
Return: Custom Carrier Label [2/2]

Change-Id: I1965fe6fd6cef7eb0fb78d856db9edf69659573d

Patchset: 4
https://gerrit.slimroms.net/#/c/1851/
[2/2] settings: add switch to last app as navigation ring target

Credits to OmniRom
[2/2] Settings: Add an option to reset custom user preferences

Change-Id: I07223fe924860dee0ce22d0946d569eeef6b9d7e
Merge "Fix elapsed time formatting." into kitkat
Settings: statusbar clock customization

Thanks a lot to SlimRoms!

https://github.com/SlimRoms/packages_apps_Settings/commit/312052742259b25edd583b58a10d2b973181b74d
Merge "[2/2] Settings: Add an option to reset custom user preferences" into kitkat
Merge "[3/3] Settings: Add AOSP Dialer check" into kitkat
Merge "[1/2] Setting: Lockscreen maximized widgets" into kitkat