marc audy 9f48592dd4 Fix up inconsistencies between UE4/Main and Dev-EngineMerge ...

#rb
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 7021692 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7093797 by marc audy in Dev-Build branch]

2019-06-19 11:13:31 -04:00

..

AndroidLicenseDialog.cpp

Fix up inconsistencies between UE4/Main and Dev-EngineMerge

2019-06-19 11:13:31 -04:00

AndroidLicenseDialog.h

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

2018-12-14 14:49:12 -05:00

AndroidPlatformEditorModule.cpp

Remove extraneous line causing compilation issues

2019-05-15 04:04:42 -04:00

AndroidSDKSettings.cpp

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

2018-12-14 14:49:12 -05:00

AndroidSDKSettings.h

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

2018-12-14 14:49:12 -05:00

AndroidSDKSettingsCustomization.cpp

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

2018-12-14 14:49:12 -05:00

AndroidSDKSettingsCustomization.h

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

2018-12-14 14:49:12 -05:00

AndroidTargetSettingsCustomization.cpp

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

2018-12-14 14:49:12 -05:00

AndroidTargetSettingsCustomization.h

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

2018-12-14 14:49:12 -05:00