Added GAPPS and link to custom squisher & Added Music.apk to replace Apollo.apk
Added missing SamsungAppsUNAService.apk
Added missing touchwiz.xml
Added missing Samsung files
Added missing libglcanvas.so
updated path to custom squisher

Change-Id: Ic4bf36101d88cba5b5d47f0bba705f5e091740b4
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	p4wifi-vendor-blobs.mk

Change-Id: I2a1a5d581de181da8fabaa56069042a2b1ce1181
Added Gapps

Change-Id: If603cc4df1a0eb52c037cfefabf4950c6a176113
Update

Change-Id: I6a5e254031c34c2fa8c638f35ec631e7a43cdd52
teresa1963
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	proprietary/lib/libnvcamerahdr.so
	proprietary/lib/libnvmm_camera.so

Change-Id: I4998e96b0e6f1227a9d08a71d50cb0dd56f7f947
Added ROMstats

Change-Id: Ib25fc54c32169da2fcc0daa869f09ab42bb9934a
Updated vendor file because CM build process has changed

Change-Id: Ia2161d9b552f6f86d05c3f0023512e591ccb7c07
Updated to latest Gapps

Change-Id: Ie5178f88c6a8be3fab58fe34bbc11b29ed575ea7
Merge branch 'cm-10.1' of git://github.com/beegee-tokyo/android_vendor_samsung_p4wifi into cm-10.1

Conflicts:
	p4wifi-vendor.mk

Change-Id: I58a2880232e41784cd3e88820fced1266dea33ee