| commit | 52dcab05c028729840c9a4df55466d2dd6bce3d2 | [log] [tgz] |
|---|---|---|
| author | Siarhei Vishniakou <svv@google.com> | Wed Sep 02 20:46:12 2020 -0700 |
| committer | Siarhei Vishniakou <svv@google.com> | Wed Sep 02 20:52:31 2020 -0700 |
| tree | 9b42cdc10f1bd53f08b97db890ef5b19f196e6f7 | |
| parent | eeabafba1667681738e7e7ed8df581f3c37e50df [diff] |
DO NOT MERGE Reorder include to remove merge conflict Rearranging these #include directives will allow the child CLs to merge cleanly into master. Bug: 163171599 Test: make only Change-Id: I15aaf14b67accc1cd7470f51b40a00af6f1e9076
diff --git a/services/inputflinger/reader/include/InputDevice.h b/services/inputflinger/reader/include/InputDevice.h index 57f0b31..14cd45c 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>