irisgeek/subway_android — pull request #6 by longjunye (2013-05-09 13:12:56+00:00)
Title: solve conflicts

solve conflicts