seanpaultaylor ec75803447 Merge conflicts in AndroidManifest.xml %!s(int64=11) %!d(string=hai) anos
..
jni e7e007b613 Enabled C++11 for Android %!s(int64=11) %!d(string=hai) anos
res 4f1676912e Split ogg and vorbis external-deps folder %!s(int64=11) %!d(string=hai) anos
AndroidManifest.xml ec75803447 Merge conflicts in AndroidManifest.xml %!s(int64=11) %!d(string=hai) anos
build.xml 4f1676912e Split ogg and vorbis external-deps folder %!s(int64=11) %!d(string=hai) anos