updata self-center  moumoua n3
a little self-center update moumoua
 i don't konw why different moumoua
2014/12/19/ 18:39 update moumoua 提交   添加了开始页面
Merge branch 'moumoua_b2'

Conflicts:
	togoandroidDemo/bin/R.txt
	togoandroidDemo/bin/classes.dex
	togoandroidDemo/bin/classes/com/example/togodemo/R$id.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$integer.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$layout.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$menu.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$string.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$style.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$styleable.class
	togoandroidDemo/bin/classes/com/example/togodemo/ShopcarFragment$NewAdapter.class
	togoandroidDemo/bin/classes/com/example/togodemo/ShopcarFragment.class
	togoandroidDemo/bin/classes/com/example/togodemo/home/OneSop_click.class
	togoandroidDemo/bin/dexedLibs/afinal_0.5.1_bin-c208531d57ac77f7be7851b7aa187123.jar
	togoandroidDemo/bin/dexedLibs/android-support-v4-151637c161a69bcd9ab5947e54135a8a.jar
	togoandroidDemo/bin/dexedLibs/android-support-v7-appcompat-379517260ca92f1f5513ff4334028c5e.jar
	togoandroidDemo/bin/dexedLibs/android-support-v7-appcompat-abd8c405c2c5dff3d2a4705fa34e09aa.jar
	togoandroidDemo/bin/dexedLibs/commons-codec-1.6-7d3f57991584c49ac04275795902c7c3.jar
	togoandroidDemo/bin/dexedLibs/commons-httpclient-3.1-d47ec1f2ce12be04db312e82c7213ced.jar
	togoandroidDemo/bin/dexedLibs/gson-2.2.4-9be96b093295d7aef6567425904c8264.jar
	togoandroidDemo/bin/dexedLibs/httpclient-4.3.2-352eed6ea5ee611226348dfbd902c9d1.jar
	togoandroidDemo/bin/resources.ap_
	togoandroidDemo/bin/togoandroidDemo.apk
	togoandroidDemo/gen/com/example/togodemo/R.java
18：42 to2