~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to 3rd_party/android-input/android/frameworks/native/libs/utils/Tokenizer.cpp

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
#include <errno.h>
24
24
#include <sys/types.h>
25
25
#include <sys/stat.h>
26
 
#include <utils/Log.h>
 
26
#include <std/Log.h>
27
27
#include <utils/Tokenizer.h>
28
28
 
29
29
// Enables debug output for the tokenizer.