AAA
CCCCCCC
Merge branch 'dev' of
https://github.com/zhangjianembedded/NotificationDemo.git into dev

Conflicts:
	src/com/example/notificationdemo/ThirdActivity.java