Merge branch 'bugfix/btdm_fix_merge_missing' into 'release/v2.1'

component/bt : fix merge missing of scan fail bugfix

See merge request !1507
This commit is contained in:
Jiang Jiang Jian
2017-11-09 14:17:41 +08:00