Elliott Hughes 10596fbcce resolved conflicts for merge of 3ce4f3d0 to master ...

Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210

2014-04-28 13:53:25 -07:00

..

jni

…

res

Import translations. DO NOT MERGE

2014-04-23 12:12:46 -07:00

src/com/android/defcontainer

Track libcore.os' move to android.system.

2014-04-28 11:11:32 -07:00

Android.mk

Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.

2014-04-18 16:39:47 -07:00

AndroidManifest.xml

…