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

« back to all changes in this revision

Viewing changes to 3rd_party/android-input/android/frameworks/base/services/input/VelocityControl.cpp

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
#include <limits.h>
25
25
 
26
26
#include <androidfw/VelocityControl.h>
27
 
#include ANDROIDFW_UTILS(BitSet.h)
28
 
#include ANDROIDFW_UTILS(Timers.h)
 
27
#include <std/BitSet.h>
 
28
#include <std/Timers.h>
29
29
 
30
30
namespace android {
31
31