Ben Marsh d832dacf48 Merging //UE4/Release-4.18 @ CL 3709383 to Release-Staging-4.18 (//UE4/Release-Staging-4.18) ...

#rb none
#jira

[CL 3715930 by Ben Marsh in Staging-4.18 branch]

2017-10-24 10:14:07 -04:00

..

Android_ASTCTargetPlatform

Merging //UE4/Dev-Main to Release-Staging-4.17 (//UE4/Release-Staging-4.17)

2017-07-21 17:56:56 -04:00

Android_ATCTargetPlatform

Merging //UE4/Dev-Main to Release-Staging-4.17 (//UE4/Release-Staging-4.17)

2017-07-21 17:56:56 -04:00

Android_DXTTargetPlatform

Merging //UE4/Dev-Main to Release-Staging-4.17 (//UE4/Release-Staging-4.17)

2017-07-21 17:56:56 -04:00

Android_ETC1TargetPlatform

Merging //UE4/Dev-Main to Release-Staging-4.17 (//UE4/Release-Staging-4.17)

2017-07-21 17:56:56 -04:00

Android_ETC2TargetPlatform

Merging //UE4/Dev-Main to Release-Staging-4.17 (//UE4/Release-Staging-4.17)

2017-07-21 17:56:56 -04:00

Android_MultiTargetPlatform

Merging //UE4/Dev-Main to Release-Staging-4.17 (//UE4/Release-Staging-4.17)

2017-07-21 17:56:56 -04:00

Android_PVRTCTargetPlatform

Merging //UE4/Dev-Main to Release-Staging-4.17 (//UE4/Release-Staging-4.17)

2017-07-21 17:56:56 -04:00

AndroidDeviceDetection

Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 3620134)

2017-08-31 12:08:38 -04:00

AndroidPlatformEditor

Merging //UE4/Release-4.18 @ CL 3709383 to Release-Staging-4.18 (//UE4/Release-Staging-4.18)

2017-10-24 10:14:07 -04:00

AndroidTargetPlatform

Merging //UE4/Release-4.18 @ CL 3709383 to Release-Staging-4.18 (//UE4/Release-Staging-4.18)

2017-10-24 10:14:07 -04:00