Hide additional blacklist separator

When there is no blacklist func enabled we dont need
2 separators at the end of row

Change-Id: Ieef2d2b5f553c2b4dd48ae528e7a0de185f4b2ad
Phone: Update Afrikaans translation

Change-Id: If9015b356460b887280ecd535372d93c21ae9fa8
phone: Enable the blacklist by default

Change-Id: I0b2d3482d75abe9c9fc161f199782f27b9baa46b
phone: Set default preference values for blacklist option

Change-Id: Iac33c84e19f30dd78226989977af90891d65018a
Fix typo

Change-Id: Ib6c4b20030497b963390fe744e0a6620ace42f19
Phone: Disable accelerometer sensor while in-call and screen UI is off

During an active ongoing call, on targets that support proximity
sensors, there is an approximate spike in the current waveform in the
order of 1 Hz. Krait is woken up frequently by the sensors even when
the Screen UI is off while in-call. This fix ensures that by disabling
the listener in such a scenario (In-Call + Screen UI turned off) there
is no spike in power consumption.

Change-Id: Ida45e1270c3f2662365fe0126a584621267cd248
CRs-Fixed: 336244, 435935
Make contacts app aware of blacklist setting (2/3)

Also fix up notify option key while we're at changing the user's
settings ;-)

Change-Id: I51069235693ee9fd055d11e62f8f152ff7bc0210
Store phone blacklist in content provider (4/4)

Change-Id: Id5f35132e66e74215158929fae0fe0276e7ba010
Phone: PT-BR update translations

Change-Id: I029b4caa8c19308a3e49b19d9d4a371e9982fc5a
Add android.permission.INTERCEPT_SMS permission.

Change-Id: I2e357b6a35d8d962eefa903b7de420b556b9f266
Merge "Add android.permission.INTERCEPT_SMS permission." into cm-10.1
Merge "Make contacts app aware of blacklist setting (2/3)" into cm-10.1
Merge "Store phone blacklist in content provider (4/4)" into cm-10.1
Also show contact name in blacklist.

JIRA:CYAN-1585
Change-Id: I45c0d6bfcb3ab403f191b315a12dfd622f2562bd
Phone: Update Polish translation

PS2: Added AOSP missing translation

Change-Id: Icf4b4ee53594cf341fc4f674bff6f88960a7fcf9
Phone: correct summary of national roaming [translation]

According to Android's writing guidelines for checkbox
settings [1], the summary should not reflect the state
of the checkbox setting but should describe the action
itself.

A workaround was applied earlier on, but this completely
removes the extra summary.

[1] http://developer.android.com/design/patterns/settings.html#writing
---
PS3: Rebasing
---
Change-Id: Ie2f6df479576d571d6402daa998e808f47e3aaaf
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1-bluez

Conflicts:
	res/values-cs/cm_strings.xml