commit for pulling
xiedong
resolve conflics
commit for merging
Merge branch 'xujing' into lianglili
commit for branch checking
commit
Merge branch 'xianrui' into lianglili
merge with xianrui
commit
lianglili
lianglili
xianrui a little change to plan end
xianrui homework finish
xianrui finish
change duration dialog trigger edittext
liangili
Merge branch 'master' of github.com:spidermandl/TimeMaster into lianglili
lianglili
xianrui merge master