← Back to branch summary

~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/VelocityTracker.cpp

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
3rd_party/android-input/android/frameworks/base/services/input/VelocityTracker.cpp
27
27
#include <limits.h>
28
28
 
29
29
#include <androidfw/VelocityTracker.h>
30
 
#include ANDROIDFW_UTILS(BitSet.h)
31
 
#include ANDROIDFW_UTILS(String8.h)
32
 
#include ANDROIDFW_UTILS(Timers.h)
33
 
#include ANDROIDFW_UTILS(Log.h)
 
30
#include <std/BitSet.h>
 
31
#include <std/String8.h>
 
32
#include <std/Timers.h>
 
33
#include <std/Log.h>
34
34
 
35
 
#include ANDROIDFW_CUTILS(properties.h)
 
35
#include <std/properties.h>
36
36
 
37
37
namespace android {
38
38