Dan Bornstein f53d0da540 resolved conflicts for merge of 1633fa9b to master ... Change-Id: Ifa5d216091696b90ecc215ca4fd6110e79bbdf99		2010-05-05 18:51:29 -07:00
..
jni	Get rid of dependency on native AssetManager API. Confirmed the native code builds with the NDK r3.	2010-04-27 22:23:03 +09:00
src	Get rid of dependency on native AssetManager API. Confirmed the native code builds with the NDK r3.	2010-04-27 22:23:03 +09:00
Android.mk	resolved conflicts for merge of 1633fa9b to master	2010-05-05 18:51:29 -07:00