linbercsu/jdroid — pull request #6 by linbercsu (2014-12-28 13:33:22+00:00)
Title: Merge pull request #5 from linbercsu/test3

fix conflict