update ui animation with frame ease type
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
merge from develop branch
resolved ui animation easing error for develop branch
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
Merge commit 'refs/pull/4795/head' of git://github.com/cocos2d/cocos2d-x into merge4795
Removes duplicated file in Android.mk
Merge pull request #4872 from dumganhar/merge4795

Merge PR #4795