diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-04-10 13:48:17 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-04-10 13:48:17 -0700 |
| commit | b246a1a750c5a337faaa6033b39e78c8bdd4c2fb (patch) | |
| tree | 410fcacc00e8b9c907d0dd8c89fa88a9c8a0b3df /main | |
| parent | 5b7e6e94a6ae92480061e7c770fcfb1592ce8b8e (diff) | |
| parent | 4bf68bf020c7fd1aabcdc4b5d8f5fbb8bacdec9d (diff) | |
| download | android_system_bt-b246a1a750c5a337faaa6033b39e78c8bdd4c2fb.tar.gz android_system_bt-b246a1a750c5a337faaa6033b39e78c8bdd4c2fb.tar.bz2 android_system_bt-b246a1a750c5a337faaa6033b39e78c8bdd4c2fb.zip | |
Merge commit '4bf68bf020c7fd1aabcdc4b5d8f5fbb8bacdec9d' into merge_work
Change-Id: Ibc6d6e691b7f97611d16f96220346dfd6ffbbf52
Diffstat (limited to 'main')
| -rw-r--r-- | main/bte_conf.c | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | main/bte_main.c | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/main/bte_conf.c b/main/bte_conf.c index 75738e1cd..2bf61dac3 100644 --- a/main/bte_conf.c +++ b/main/bte_conf.c @@ -23,6 +23,7 @@ #include <string.h> #include "bta_api.h" +#include "osi/include/compat.h" #include "osi/include/config.h" #include "osi/include/log.h" diff --git a/main/bte_main.c b/main/bte_main.c index de62232df..de62232df 100755..100644 --- a/main/bte_main.c +++ b/main/bte_main.c |