Andreas Gampe 69974972be resolved conflicts for merge of 64884bb1 to lmp-mr1-dev-plus-aosp		2014-09-24 16:00:12 -07:00
..
tests	resolved conflicts for merge of 64884bb1 to lmp-mr1-dev-plus-aosp	2014-09-24 16:00:12 -07:00
Android.mk	LibNativeBridge: Add early init & env setup	2014-09-23 20:08:25 -07:00
native_bridge.cc	Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"	2014-09-24 15:58:23 -07:00