Dimitry Ivanov ac8abec905 resolve merge conflicts of bb958f0f5 to oc-dev-plus-aosp ... Test: n/a Change-Id: Iede624aa5210794d48b63d6053293028483b89c7		2017-05-25 09:57:15 -07:00
..
tests	Convert libnativebridge[23]?-dummy to soong.	2017-05-08 15:29:10 -07:00
.clang-format	Load vendor public libraries to sphal namespace	2017-05-24 11:02:31 -07:00
Android.bp	Convert libnativebridge[23]?-dummy to soong.	2017-05-08 15:29:10 -07:00
Android.mk	Convert more Android.mk files to Android.bp	2016-07-13 17:41:45 -07:00
native_bridge.cc	resolve merge conflicts of bb958f0f5 to oc-dev-plus-aosp	2017-05-25 09:57:15 -07:00