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

..

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

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

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

AndroidPlatformEditor

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

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

AndroidTargetPlatform

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

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