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 b49ff0f51e Fixed BlackBerry 10.2 Simulator builds. %!s(int64=12) %!d(string=hai) anos
AndroidManifest.xml ec75803447 Merge conflicts in AndroidManifest.xml %!s(int64=11) %!d(string=hai) anos
build.xml 784a5344a8 Fix for android build %!s(int64=11) %!d(string=hai) anos