xxxxx

xxxxxxxxxxxxxx
解决bug1
Merge branch 'bug1' into dev

Conflicts:
	src/com/example/notificationdemo/ThirdActivity.java
ok
fix bug2
Merge branch 'bug2' into dev
第三个啦