added contact lockscreen icon

Change-Id: I204e3a43d3e2beed391e605f3d3add55b24bb4b7
Frameworks_base: refactor translations

Not others languages in progress

Change-Id: I996968b7a2a70fd3705a13cb7e38d663c2d8b814
Duplicate Media cleanup

Clean duplicate notifications and ringtones.
JIRA : https://jira.cyanogenmod.org/browse/CYAN-292

Change-Id: Icab24ca455891c2347fd521e4d8c804cb024c51f
Option to use volume keys to control media volume anytime (2/2)

See Settings part for description

Change-Id: I78d26b0bd41f5b58514ae9c68208a8c950396823
Merge "Option to use volume keys to control media volume anytime (2/2)" into cm-10.1
FrameworkBase: Add missing AF translations

Change-Id: Ifb927bb38d46e450321f9014f65719c561eb8b43
Merge "added contact lockscreen icon" into cm-10.1
merge CyanogenMod

Change-Id: I7d863bbfa360e6445a6de10643f54fd07d5b0919