Merging 5360223 from Dev-EngineMerge. DevK integration.

Browse Source

#rb #jira na

[CL 5361784 by Andrew Grant in Main branch]

...

This commit is contained in:

Andrew Grant

2019-03-11 15:12:02 -04:00

parent 440ae3a9f5

commit da2cbfff1f

29 changed files with 788 additions and 990 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

561

Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template

File diff suppressed because it is too large Load Diff