343
Merge branch 'master' of https://github.com/oday0312/taotaokanAndroid

Conflicts:
	.idea/workspace.xml

out/production/taotaoKan/com/example/taotaokanAndroid/SettingActivity$1.
class

out/production/taotaoKan/com/example/taotaokanAndroid/SettingActivity.cl
ass
	out/production/taotaoKan/taotaoKan.apk
	out/production/taotaoKan/taotaoKan.unaligned.apk
	taotaoKan/src/com/example/taotaokanAndroid/SettingActivity.java