mic rooney ff3d7a2313 Updating AndroidThunkJava_IsGamepadAttached to not check SOURCE_DPAD because it was false flagging gamepads. ...

Chris.Babcock

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: mic.rooney
#ROBOMERGE-SOURCE: CL 5345005 via CL 5345014 via CL 5345016 via CL 5346535 via CL 5346620
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5402562 by mic rooney in Dev-Networking branch]

2019-03-14 17:26:55 -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

Updating AndroidThunkJava_IsGamepadAttached to not check SOURCE_DPAD because it was false flagging gamepads.

2019-03-14 17:26:55 -04:00

aar-imports-ant.txt

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

2018-06-07 22:39:07 -04:00

aar-imports.txt

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

2018-06-07 22:39:07 -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-Networking (//UE4/Dev-Networking)

2018-06-07 22:39:07 -04:00