Get/Set country and return data to main activity
manifest
Merge branch 'master' of https://github.com/tonyKwan/assignment1

Conflicts:
	src/kb50/phonedialler/CountryActivity.java