Ben Marsh f20a48849e Merging //UE4/Release-4.17 @ 3539194 to Release-Staging-4.17 (//UE4/Release-Staging-4.17) ...

#rb none
#jira

[CL 3549254 by Ben Marsh in Staging-4.17 branch]

2017-07-21 21:01:33 -04:00

..

gradle

Copying //UE4/Dev-Mobile to //UE4/Dev-Main (Source: //UE4/Dev-Mobile @ 3496193)

2017-06-16 20:17:59 -04:00

JavaLibs/downloader_library

Copying //UE4/Release-Staging-4.13 to //UE4/Dev-Main (Source: //UE4/Release-4.13 @ 3072953)

2016-08-05 17:47:48 -04:00

JavaTemplates

Add launch image support for Android (disabled for GearVR)

2015-08-28 19:34:42 -04:00

jni

…

libs

Copying //UE4/Release-Staging-4.13 to //UE4/Dev-Main (Source: //UE4/Release-4.13 @ 3072953)

2016-08-05 17:47:48 -04:00

res

Copying up 3 Android resource files somehow missed by Dev-Mobile integration

2016-07-20 08:41:00 -04:00

src/com

Merging //UE4/Release-4.17 @ 3539194 to Release-Staging-4.17 (//UE4/Release-Staging-4.17)

2017-07-21 21:01:33 -04:00

aar-imports.txt

Update to Google Play Services 9.8.0

2017-06-14 16:37:58 -04:00

AndroidOpenSourceProject.tps

Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 2949393)

2016-04-22 11:21:10 -04:00

custom_rules.xml

Fix older Android SDK zipalign path for Ant and an issue for mac (.bat was hardcoded)

2015-06-22 12:52:23 -04:00

proguard-project.txt

Copying //UE4/WEX-Staging to //UE4/Dev-Main (Source: //WEX/Main @ 3440877)

2017-06-08 10:21:39 -04:00