my profile activity
cloud reco
Merging
Merge branch 'master' of https://github.com/zchennn/glifitApp.git

Conflicts:
	Glifit/src/com/qualcomm/QCARSamples/CloudRecognition/CloudReco.java