Jesse Hall 94bb931884 resolved conflicts for merge of 3e06bd39 to master ...

I'm not sure why git thought there was a conflict; it thought these
files had been deleted in master and renamed in lmp-preview-dev. In
reality, they've never existed anywhere, and were created in
lmp-preview-dev by the change being merged. Weird.

Conflicts:
	ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.functions.txt
	ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.variables.txt
	ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.functions.txt
	ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.variables.txt
	ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.functions.txt
	ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.variables.txt
	ndk/platforms/android-21/arch-mips64/symbols/libGLESv3.so.variables.txt
	ndk/platforms/android-21/arch-x86/symbols/libGLESv3.so.variables.txt
	ndk/platforms/android-21/arch-x86_64/symbols/libGLESv3.so.variables.txt

Change-Id: Ic7cc66f1fa053ff05d55911caad92dfd6669138d

2014-06-10 12:17:15 -07:00

..

platforms

resolved conflicts for merge of 3e06bd39 to master

2014-06-10 12:17:15 -07:00

samples

Enhance hello-jni to report APP_ABI at compilation

2013-12-02 10:22:47 +08:00

sources/android

Fix libportable build breakage.

2014-06-07 22:24:44 -07:00

tests

Update prebuilt library test.

2010-09-22 15:11:57 +02:00

tools

Little fix for headers comparison tool

2013-10-07 17:30:08 +04:00

.gitignore

Separate platform files and samples by API level.

2010-07-29 18:07:56 -07:00

Android.mk

Add support for building the NDK's native_app_glue.

2013-12-26 15:39:36 +00:00