irisgeek/subway_android — pull request #8 by longjunye (2013-05-11 02:43:03+00:00)
Title: solve conflicts

solve conflicts