Syn
Merge branch 'master' of https://github.com/psean21c/AndroidBasic

Conflicts:
	Sandbox/Drew/SearchAndDial/AndroidManifest.xml
	Sandbox/Drew/SearchAndDial/res/drawable-hdpi/ic_launcher.png
	Sandbox/Drew/SearchAndDial/res/layout/activity_main.xml
	Sandbox/Drew/SearchAndDial/res/layout/child_row.xml
	Sandbox/Drew/SearchAndDial/res/layout/store_list.xml

Sandbox/Drew/SearchAndDial/src/com/example/searchanddial/MainActivity.ja
va

Sandbox/Drew/SearchAndDial/src/com/example/searchanddial/StoreListActivi
ty.java