fixed #1812: A warning of getStringWithEllipsisJni function when compiling it with clang.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed #1812: Minor fix.
fixed #1811: getStringWithContentsOfFile ~> getStringFromFile .
Merge pull request #2122 from dumganhar/iss1811

fixed #1811: getStringWithContentsOfFile ~> getStringFromFile .
Merge pull request #2121 from dumganhar/master

fixed #1812: A warning of getStringWithEllipsisJni function when compiling it with clang.
Merge remote-tracking branch 'remotes/upstream/master'