FLAG_ONE_SHOT is not guaranteed to update the extras.

In contrast, according to the docs [1], FLAG_CANCEL_CURRENT is. Also
keep track of the notifications on a per-device basis.

[1]
http://developer.android.com/reference/android/app/PendingIntent.html

Change-Id: Ie04f60cde6a4332178373ce6be073e04036676c0
Fix adding lockscreen targets.

The empty targets were not included in the setting properly.
Also make the code a little more memory efficient.

Change-Id: I05cc7ce55ef5789f063033116ebfd9337e5ee28a
Remove unused stuff.

Change-Id: If733fef2e11349c7d07d36c476521f26916a0318
Settings : Re-organize menu structure
Remove debug leftovers.

Change-Id: I8d800829fe2f404810575d767cff864cf74cc80b
Settings: EL translations

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I12dae3dede954b6c73dcba6c6f7a40239e12f6d3

Conflicts:

	res/values-el/cm_strings.xml
Settings: PT-BR update translations

Change-Id: I2ed5dc924939c092d43d06183863cc723841c735
Settings: RU translation

Change-Id: I8826ac51b732c907fc71c411ca79a241dd1e7285

Patch set 2: Update translation

Change-Id: Idbf1737184bb1335ae49f200129f28c4e087126c

Patch set 3: Update translation

Change-Id: I4292649ce2b2b8cc83568ddc5d7f33b8ebdb0f3c

Patch set 4: Update translation

Change-Id: I7229110cb5ab0c3d93a776d596e553145dc142bb
Settings: DE translations

Change-Id: I3a04ab26b7c48478064e8f461c2adf7fb6a1dcd9

Conflicts:

	res/values-de/cm_strings.xml
Settings: ES translations

- Change Hangouts name
- Wake up on plug behavior
- Vibrator and color settings
- Re-organize menu structure
- New copyright notice

Change-Id: I13fa565c098d4a6f29f2f73e2257140aa19c7008

Conflicts:

	res/values-es/cm_strings.xml