Commit b4312864716b1c8eeaa140eb14245519f7c87fd1

Sam Lantinga 2020-02-13T10:19:05

Resolved conflict and added Android_JNI_RequestPermission()