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
Settings : Re-organize menu structure

Change-Id: I7e03f1a8e1da4545d933b91c1a50e5cf72ab4ab0
Merge "FLAG_ONE_SHOT is not guaranteed to update the extras." into cm-10.2
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
Remove debug leftovers.

Change-Id: I8d800829fe2f404810575d767cff864cf74cc80b
Merge "Remove unused stuff." into cm-10.2
Merge "Fix adding lockscreen targets." into cm-10.2
Settings: PT-BR update translations

Change-Id: I2ed5dc924939c092d43d06183863cc723841c735
Fix conflicts after merge upstream/cm-10.2:

Conflicts:

res/xml/display_settings.xml
res/xml/system_settings.xml -> res/xml/system_ui_settings.xml
src/com/android/settings/DisplaySettings.java
src/com/android/settings/cyanogenmod/SystemSettings.java -> src/com/android/settings/cyanogenmod/SystemUiSettings.java

Change-Id: I0f203263ea99fba3e90fc8e2a8f74ec4dfa4c0e6
Merge remote-tracking branch 'upstream/cm-10.2' into dark-jelly-cm-10.2