add cmhw

Change-Id: Id9c63cd0582fccad0eb33ede897dce78b086c79a
permission for vibrator amplitude

Change-Id: Ia111edc12827431ec3a8f486f26e6286f57f8387
aries: Enable proximity wake option

Change-Id: I99a6c475e533b27429b265407d58a05fcac80d2d

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml
tweak performance profile

Change-Id: I0350c035f8f00ca7bd0e9c96105c011a5f844eae
add permission for  KeyDisabler

Change-Id: I03d15c538bec93cbec3a2db215efc9d29fe57138
Merge "tweak performance profile" into kk_mkt
Merge "add permission for  KeyDisabler" into kk_mkt
aries: use common apns

Change-Id: I4cd4e0e966e9d04175805cb02ee099d890d3c238
Merge pull request #3 from MoKee/kk_mkt

Merge update from upstream