summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-03 18:39:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-09-03 18:39:47 +0000
commitfa9212316a5067eef37e06e9550647e3dcd97083 (patch)
tree9b42cdc10f1bd53f08b97db890ef5b19f196e6f7
parenteeabafba1667681738e7e7ed8df581f3c37e50df (diff)
parent52dcab05c028729840c9a4df55466d2dd6bce3d2 (diff)
downloadnative-fa9212316a5067eef37e06e9550647e3dcd97083.tar.gz
Merge "DO NOT MERGE Reorder include to remove merge conflict"
-rw-r--r--services/inputflinger/reader/include/InputDevice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/inputflinger/reader/include/InputDevice.h b/services/inputflinger/reader/include/InputDevice.h
index 57f0b319c8..14cd45cf07 100644
--- a/services/inputflinger/reader/include/InputDevice.h
+++ b/services/inputflinger/reader/include/InputDevice.h
@@ -23,9 +23,9 @@
#include <input/DisplayViewport.h>
#include <input/InputDevice.h>
+#include <stdint.h>
#include <utils/PropertyMap.h>
-#include <stdint.h>
#include <optional>
#include <vector>