scotthartbti/android — pull request #3 by wantowan2 (2014-01-25 10:23:00+00:00)
Title: Fix derp

Looked like some sort of merge conflict marker <<<<<<<<< etc...