tree 4b961a6133ed8ceb5d2a4f7d194c81d1d54ba312
parent d62d7ebd0c05f83f993ef75eb3d7918c769d1d98
author Sam Lantinga <slouken@libsdl.org> 1581617945 -0800
committer Sam Lantinga <slouken@libsdl.org> 1581617945 -0800

Resolved conflict and added Android_JNI_RequestPermission()