tsubasa

Change-Id: I03bd91d2c8f75eb8eaa1e90959631142fe5f68fe
Conflicts:
	overlay/common/packages/apps/Dialer/res/values/config.xml