diff options
| author |   Enrico Loparco (eloparco) <eloparco@cisco.com> | 2021-06-24 09:15:41 +0200 |
|---|---|---|
| committer | Enrico Loparco (eloparco) <eloparco@cisco.com> | 2021-06-24 09:15:41 +0200 |
| commit | 229385955109b866a23c4ac2aa03d4d11044c39d (patch) | |
| tree | 0591f9c2fc4144d62330337cc2b94c63dfeded54 /ctrl/facemgr/src/main.c | |
| parent | 6ffbb5ed61733b8dbef39b1a9d437e899e9359d7 (diff) | |
[HICN-708] Rebase with master
Signed-off-by: Enrico Loparco (eloparco) <eloparco@cisco.com>
Change-Id: I2122e1d61dd3b2e039972624ffbdbcb3c5610159
Diffstat (limited to 'ctrl/facemgr/src/main.c')
| -rw-r--r-- | ctrl/facemgr/src/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctrl/facemgr/src/main.c b/ctrl/facemgr/src/main.c index da5e55943..344b034ae 100644 --- a/ctrl/facemgr/src/main.c +++ b/ctrl/facemgr/src/main.c @@ -186,7 +186,7 @@ MAIN_LOOP: facemgr_set_callback(facemgr, loop, (void*)loop_callback); #ifdef __ANDROID__ - facemgr_set_jvm(facemgr, NULL, NULL); // FIXME + facemgr_set_jvm(facemgr, NULL); #endif /* __ ANDROID__ */ DEBUG("Bootstrap..."); |