← 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/InputManager.h

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/InputManager.h
27
27
 
28
28
#include <androidfw/Input.h>
29
29
#include <androidfw/InputTransport.h>
30
 
#include ANDROIDFW_UTILS(Errors.h)
31
 
#include ANDROIDFW_UTILS(Vector.h)
32
 
#include ANDROIDFW_UTILS(Timers.h)
33
 
#include ANDROIDFW_UTILS(RefBase.h)
34
 
#include ANDROIDFW_UTILS(String8.h)
 
30
#include <std/Errors.h>
 
31
#include <std/Vector.h>
 
32
#include <std/Timers.h>
 
33
#include <std/RefBase.h>
 
34
#include <std/String8.h>
35
35
 
36
36
namespace android {
37
37