Calin Juravle 792e269127 resolved conflicts for merge of 7a1abfe3 to lmp-mr1-dev-plus-aosp ... Change-Id: Ie5db9f745e01bd24faa317af0cd8874e1099ebdf		2014-10-29 19:51:04 +00:00
..
tests	resolved conflicts for merge of 7a1abfe3 to lmp-mr1-dev-plus-aosp	2014-10-29 19:51:04 +00:00
Android.mk	Handle code_cache dir creation in libnativebridge	2014-10-27 15:37:32 +00:00
native_bridge.cc	Merge "Don't allow SUPPORTED_ABIs to be set by the native bridge."	2014-10-27 16:16:02 +00:00