chris babcock 6a8c0374a5 Fix bad merge ...

#jira UE-64784
#ue4
#android
#rb trivial

#ROBOMERGE-SOURCE: CL 4428046 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4428047 by chris babcock in Staging-4.21 branch]

2018-10-04 12:35:23 -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

Copying //UE4/Fortnite-Staging to //UE4/Dev-Main (Source: //Fortnite/Main/Engine @ 3876564)

2018-02-22 11:25:06 -05: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

Fix bad merge

2018-10-04 12:35:23 -04:00

aar-imports-ant.txt

Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)

2018-06-26 08:42:47 -04:00

aar-imports.txt

Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)

2018-06-26 08:42:47 -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

Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)

2018-06-26 08:42:47 -04:00