Merge "DO NOT MERGE Reorder include to remove merge conflict" (fa921231) · Commits · e / os / android_frameworks_native-old

services/inputflinger/reader/include/InputDevice.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,9 +23,9 @@

	#include <input/DisplayViewport.h>		#include <input/DisplayViewport.h>
	#include <input/InputDevice.h>		#include <input/InputDevice.h>
			#include <stdint.h>
	#include <utils/PropertyMap.h>		#include <utils/PropertyMap.h>

	#include <stdint.h>
	#include <optional>		#include <optional>
	#include <vector>		#include <vector>