added contact lockscreen icon

Change-Id: I204e3a43d3e2beed391e605f3d3add55b24bb4b7
aapt: allow toggling "errors instead of warnings"

* This patch makes the default behaviour same as AOSP,
  treating untranslatable strings in any but the default
  locale as warnings.
* Setting the environment variable AAPT_ERROR_ON_WARNING to
  anything will make those warnings, errors.

Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
Change-Id: I7da98d277495a7646ad64ba2f7e6a6bf14290f98
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 branch 'cm-10.1' of github.com:CyanogenMod/android_frameworks_base into cm-10.1