add work2
Merge branch 'work2' into dev
modify Work2Activity
add Toast
add out
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/com/example/gitexample/Work2Activity.java
KK
sss
ddddd
eeeeeeeeee
Update Kk.java
re
all
000
1111111111111
Merge branch 'dev' of
https://github.com/zhangjianembedded/GitExample.git into dev

Conflicts:
	src/com/example/gitexample/Kk.java
add AAA.java
add message
add message 2
Merge branch 'master' of https://github.com/zhangjianembedded/GitExample.git