Narayan Kamath 26c6c03196 Fix build. ...

Bad resolution of a manual rebase.

Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7

2014-06-03 14:54:52 +01:00

..

jni

…

res

…

src/com/android/defcontainer

Fix build.

2014-06-03 14:54:52 +01:00

Android.mk

Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.

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

AndroidManifest.xml

…