Commit 52dcab05 authored Sep 02, 2020 by Siarhei Vishniakou

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

parent eeabafba

services/inputflinger/reader/include/InputDevice.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>