Ignore

Change-Id: Id68fb20a981ef8fb1cd6400ea758f75cbb3e0f4d
Merge branch 'kitkat' of https://github.com/J-Team/platform_frameworks_base into kitkat

Conflicts:
	CleanSpec.mk

Change-Id: I1d6b4cfb1bae8eb74cec13e95288ed2a35b72059