modified config.h
Merge branch 'cm-10.2' of https://github.com/robt77/android_frameworks_native into cm-10.2

Conflicts:
	include/android/configuration.h