chris babcock 6552e977b5 Only keep Profile override from ConifgRules if OverrideProfile left set ...

#android
[FYI] Jack.Porter
#rb trivial


#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5923214 via CL 5923242 via CL 5932554 via CL 5932753
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5942295 by chris babcock in Dev-VR branch]

2019-04-17 13:24:29 -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

Only keep Profile override from ConifgRules if OverrideProfile left set

2019-04-17 13:24:29 -04:00

aar-imports-ant.txt

Merge to Dev-Main for 4.20 @ 4090813

2018-05-23 21:04:31 -04:00

aar-imports.txt

Merge to Dev-Main for 4.20 @ 4090813

2018-05-23 21:04:31 -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

…

proguard-project.txt

Merging CL 5808949 - support streaming live video on Android

2019-04-12 13:09:48 -04:00