7a9660e8d2
# Conflicts:
# platform/android/java/lib/src/org/godotengine/godot/GodotIO.java
(cherry picked from commit
|
||
---|---|---|
.. | ||
aidl/com/android/vending/licensing | ||
patches | ||
res | ||
src | ||
AndroidManifest.xml | ||
THIRDPARTY.md | ||
build.gradle |