Remove merge error in cm_arrays comment block

* Also fix the copyright header spacing

Change-Id: Ic9a795647392dd657b13362a8d0ffa3ac832c512
Settings: Volume key cursor control (2/2)

Change-Id: Ibc52b5d0c59558be9a24286ef6f1c6f049e117a3
settings: port IME selector notification toggle (1/2)

Change-Id: Idb29f94aa4be51166b24b59930428401ddd7416b
Settings: Convert AppOps array items to string references

* Avoid future breakage
 This will need conversion of all AOSP translated arrays to strings

Change-Id: I2e52e4013d1232d529ce5b9e3aae3502c42e938a
Merge branch 'remote' into mkl

Conflicts:
	src/com/android/settings/ButtonSettings.java

Change-Id: Id42af49e07d83c243c3bf0efec951b34c50e6073