Narayan Kamath d11f223c53 resolved conflicts for merge of 286a247e to master ...

Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c

2014-04-10 10:38:31 +01:00

..

jni

…

res

…

src/com/android/defcontainer

Re-implement native library search and copies.

2014-04-09 17:16:40 +01:00

Android.mk

…

AndroidManifest.xml

…