Translation - Separating AOSP and CM strings

Change-Id: I18b8456d2fe74181402c9fa9f6cab8e996434cfc
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_frameworks_base into cm-10.1
add property to disable hw acceleration on lockscreen

Change-Id: I8ca5ac249e3211cf01d2528fee0f4a02d02d24d7
Revert "Revert "am: Allow more hidden apps on devices with lots of RAM""

This reverts commit 9f617a00eb5b7b8fa89f3b61182ab8c8ff94097b.