omni

Conflicts:
	overlay/frameworks/base/core/res/res/values/arrays.xml