modified:   bin/DreamClock.apk
	modified:   bin/R.txt
	modified:   bin/classes.dex
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$anim.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$attr.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$bool.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$color.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$dimen.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$drawable.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$id.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$integer.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$layout.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$menu.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$string.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$style.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$styleable.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$2$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$2$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$5.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$6$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$6.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$ListClickGroup.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$ListJeerItem.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity.class
	deleted:    bin/classes/cn/jlu/ge/dreamclock/activity/SignInUsersActivity$UsersAdapter$ListClickGroup.class
	deleted:    bin/classes/cn/jlu/ge/dreamclock/activity/SignInUsersActivity$UsersAdapter.class
	deleted:    bin/classes/cn/jlu/ge/dreamclock/activity/SignInUsersActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/UserInfoActivity$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/UserInfoActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/ReadParseClass.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/UploadPhoneNumberTask.class
	new file:   bin/classes/cn/jlu/ge/dreamclock/tools/UserPreferenceDataManager.class
	modified:   bin/classes/com/handmark/pulltorefresh/library/R$anim.class
	modified:   bin/dexedLibs/actionbarsherlock-bd388ef04581f5aa9a60a657f13733d6.jar
	modified:   bin/dexedLibs/androidaysnchttp-a416a227154c2991ef69165e5ba9d94f.jar
	modified:   bin/dexedLibs/library-84a334a5b2f7e9aa79dd9bfb0f1e8180.jar
	modified:   bin/dexedLibs/sliding_menu-514a327db40b6db34265f7443c5834aa.jar
	modified:   bin/resources.ap_
	modified:   gen/cn/jlu/ge/dreamclock/R.java
	modified:   gen/com/handmark/pulltorefresh/library/R.java
	modified:   res/anim/fly_out_item.xml
	new file:   res/anim/list_fly_out_item.xml
	modified:   res/values/dimens.xml
	modified:   src/cn/jlu/ge/dreamclock/activity/SignInActivity.java
	deleted:    src/cn/jlu/ge/dreamclock/activity/SignInUsersActivity.java
	modified:   src/cn/jlu/ge/dreamclock/activity/UserInfoActivity.java
	modified:   src/cn/jlu/ge/dreamclock/tools/ReadParseClass.java
	modified:   src/cn/jlu/ge/dreamclock/tools/UploadPhoneNumberTask.java
	new file:   src/cn/jlu/ge/dreamclock/tools/UserPreferenceDataManager.java

 Untracked files:
	.classpath
	.project
	.settings/
some git question.
remove some file add by mistake.
new commit.
	deleted:    src (2)/cn/jlu/ge/dreamclock/activity/ActivityStrangers.java
	deleted:    src (2)/cn/jlu/ge/dreamclock/activity/FriendListActivity.java
	deleted:    src (2)/cn/jlu/ge/dreamclock/activity/LoginActivity.java
	deleted:    src (2)/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity.java
	deleted:    src (2)/cn/jlu/ge/dreamclock/activity/SignUpActivity.java
	deleted:    src (2)/cn/jlu/ge/dreamclock/tools/ContactsDBAdapter.java
	deleted:    src (2)/cn/jlu/ge/dreamclock/tools/FriendsDBAdapter.java
	deleted:    src (2)/cn/jlu/ge/dreamclock/tools/GetContects.java
	deleted:    src (2)/cn/jlu/ge/dreamclock/tools/MenuFragment.java
	deleted:    src (2)/cn/jlu/ge/dreamclock/tools/ReadParseClass.java
	deleted:    src (2)/cn/jlu/ge/dreamclock/tools/UploadPhoneNumberTask.java
	deleted:    src.rar
 Changes to be committed:
	modified:   bin/DreamClock.apk
	modified:   bin/classes.dex
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/ActivityStrangers$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$3$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$GetDataTask$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$GetDataTask.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/LoginActivity$LoginTask.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity$GetDataTask.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$5.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$6$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$6.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$ListClickGroup.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$ListJeerItem.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity$RegisterTask.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/ContactsDBAdapter$DBHelper.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/ContactsDBAdapter.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/FriendsDBAdapter$DBHelper.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/GetContects.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/MenuFragment$MenuAdapter.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/MenuFragment$MenuItem.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/MenuFragment.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/ReadParseClass.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/UploadPhoneNumberTask.class
	modified:   bin/resources.ap_
	modified:   src/cn/jlu/ge/dreamclock/activity/SignInActivity.java
	modified:   src/cn/jlu/ge/dreamclock/activity/SignUpActivity.java
	modified:   src/cn/jlu/ge/dreamclock/tools/GetContects.java
	modified:   src/cn/jlu/ge/dreamclock/tools/ReadParseClass.java
	modified:   src/cn/jlu/ge/dreamclock/tools/UploadPhoneNumberTask.java
Merge github.com:xia-knight/WakeMeUp_android

Conflicts:
	bin/R.txt
	bin/SignUpActivity.apk
	bin/classes.dex
	bin/classes/cn/jlu/ge/dreamclock/R$attr.class
	bin/classes/cn/jlu/ge/dreamclock/R$bool.class
	bin/classes/cn/jlu/ge/dreamclock/R$color.class
	bin/classes/cn/jlu/ge/dreamclock/R$dimen.class
	bin/classes/cn/jlu/ge/dreamclock/R$drawable.class
	bin/classes/cn/jlu/ge/dreamclock/R$id.class
	bin/classes/cn/jlu/ge/dreamclock/R$integer.class
	bin/classes/cn/jlu/ge/dreamclock/R$layout.class
	bin/classes/cn/jlu/ge/dreamclock/R$menu.class
	bin/classes/cn/jlu/ge/dreamclock/R$string.class
	bin/classes/cn/jlu/ge/dreamclock/R$style.class
	bin/classes/cn/jlu/ge/dreamclock/R$styleable.class
	bin/classes/cn/jlu/ge/dreamclock/activity/ActivityStrangers$1.class
	bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$2.class
	bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$4.class
	bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/LoginActivity$LoginTask.class
	bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity$2.class
	bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$1.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignInUsersActivity$UsersAdapter.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignInUsersActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity$3.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity$RegisterTask.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/UserInfoActivity.class
	bin/classes/cn/jlu/ge/dreamclock/tools/GetContects.class
	bin/classes/cn/jlu/ge/dreamclock/tools/MenuFragment$MenuAdapter.class
	bin/classes/cn/jlu/ge/dreamclock/tools/MenuFragment.class
	bin/classes/cn/jlu/ge/dreamclock/tools/ReadParseClass.class
	bin/classes/cn/jlu/ge/dreamclock/tools/UploadPhoneNumberTask.class
	bin/dexedLibs/actionbarsherlock-bd388ef04581f5aa9a60a657f13733d6.jar
	bin/dexedLibs/androidaysnchttp-a416a227154c2991ef69165e5ba9d94f.jar
	bin/dexedLibs/library-96511caf41d77ebf635eaffaa1d37b35.jar
	bin/dexedLibs/sliding_menu-514a327db40b6db34265f7443c5834aa.jar
	bin/resources.ap_
	src/cn/jlu/ge/dreamclock/tools/GetContects.java

	modified:   bin/R.txt
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$anim.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$2$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$2$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$5.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$6$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$6.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$ListClickGroup.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter$ListJeerItem.class
	deleted:    bin/classes/cn/jlu/ge/dreamclock/activity/SignInUsersActivity$UsersAdapter$ListClickGroup.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/UserInfoActivity$1.class
	new file:   bin/classes/cn/jlu/ge/dreamclock/tools/UserPreferenceDataManager.class
	modified:   bin/classes/com/handmark/pulltorefresh/library/R$anim.class
	new file:   bin/dexedLibs/actionbarsherlock-bd388ef04581f5aa9a60a657f13733d6.jar
	new file:   bin/dexedLibs/androidaysnchttp-a416a227154c2991ef69165e5ba9d94f.jar
	new file:   bin/dexedLibs/sliding_menu-514a327db40b6db34265f7443c5834aa.jar
	modified:   gen/cn/jlu/ge/dreamclock/R.java
	modified:   gen/com/handmark/pulltorefresh/library/R.java
	modified:   res/anim/fly_out_item.xml
	new file:   res/anim/list_fly_out_item.xml
	modified:   res/values/dimens.xml
	modified:   src/cn/jlu/ge/dreamclock/activity/SignInActivity.java
	deleted:    src/cn/jlu/ge/dreamclock/activity/SignInUsersActivity.java
	modified:   src/cn/jlu/ge/dreamclock/activity/UserInfoActivity.java
	modified:   src/cn/jlu/ge/dreamclock/tools/GetContects.java
	modified:   src/cn/jlu/ge/dreamclock/tools/ReadParseClass.java
	modified:   src/cn/jlu/ge/dreamclock/tools/UploadPhoneNumberTask.java
	new file:   src/cn/jlu/ge/dreamclock/tools/UserPreferenceDataManager.java