PropModder

Change-Id: I711d67a7b2f2bfda1e375d61ffd16b0b3d04e8d3
Signed-off-by: timpohladthomas <timpohladthomas@gmail.com>

Conflicts:
	AndroidManifest.xml
	res/values/liquid_arrays.xml
	res/values/ose_strings.xml
Merge remote-tracking branch 'upstream/kitkat2' into kk44