component/bt: Merge branch 'feature/btdm_bluedroid' into feature/bt_gap

This commit is contained in:
wangmengyang 2016-10-21 15:19:39 +08:00
commit 063e9e8287
13 changed files with 1695 additions and 1695 deletions

View file

@ -19,7 +19,7 @@
#include "hash_map.h"
#include "hash_functions.h"
#include "alarm.h"
//#include "app_button.h"
#include "app_button.h"
#if (BUT_PROFILE_CFG)
#include "button_pro.h"
#endif ///BUT_PROFILE_CFG