OSDN Git Service

resolve merge conflicts of 1f433cb to mnc-dr-dev am: f15ca6d21d -s ours am: 8e80a26078
[android-x86/system-bt.git] / .gitignore
1 buildtools
2 out
3 third_party