大致确定了主要布局
aa
Delete R.java
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git

Conflicts:
	gen/com/bupt/bnrc/thesenser/R.java
Merge branch 'master' of https://github.com/bnrcParticipationSense/theSense.git
添加了界面的信息采集
Merge branch 'master' of https://github.com/bnrcParticipationSense/theSense.git
在ui中添加了照相功能
添加了照相监听函数
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git
添加了瀑布流照片
添加了一些东西
xxj
..再次提交
为什么总是不行啊