Conflicts: cocos/platform/android/CCDevice-android.cpp cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java cocos/platform/ios/CCDevice-ios.mm cocos/platform/mac/CCDevice-mac.mm cocos/platform/win32/CCDevice-win32.cpp