OSDN Git Service

resolve merge conflicts of 1f433cb to mnc-dr-dev am: f15ca6d21d -s ours am: 8e80a26078
[android-x86/system-bt.git] / tools / hci /
drwxr-xr-x   ..
-rw-r--r-- 1055 Android.mk.disabled
-rw-r--r-- 5623 main.c