"frameworks/base: FI translations" into cm-10.2
"Fix status bar brightness control when on …

... secure lock screen" into cm-10.2