Dianne Hackborn 161e67ff3b resolved conflicts for merge of 06a8ceac to master ...

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69

2011-05-19 21:44:52 -07:00

..

android

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

graphics/jni

For issue #2651381, allow library prelinking.

2010-05-05 18:23:05 -07:00

include/android

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

copy-to-ndk.sh

Update script for copying NDK headers/library.

2010-10-21 21:10:26 -07:00