Matthew Griffin 984342ca17 Merging //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) post CL#2804086 to CL#2817167 ...

CL#2805395 resolved as target to avoid copying 2015 changes
#lockdown Nick.Penwarden

[CL 2819197 by Matthew Griffin in Main branch]

2016-01-07 11:21:22 -05:00

..

JavaLibs

Code documentation from CL#2636592

2015-07-29 07:47:34 -04:00

JavaTemplates

Add launch image support for Android (disabled for GearVR)

2015-08-28 19:34:42 -04:00

jni

…

libs

Updating TPS files

2015-09-04 20:53:02 -04:00

res

Merging using UE4-To-UE4-Releases-4.10

2015-10-02 15:29:14 -04:00

src/com

Merging //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) post CL#2804086 to CL#2817167

2016-01-07 11:21:22 -05: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

Copying //UE4/Dev-Platform to //UE4/Main

2015-12-10 16:56:55 -05:00