commit 0f352fbd98affe4a95afd0327b8cf5279fb3d811
author Amy Hsu <amyhsu@google.com> Mon Jun 15 17:04:12 2020 +0800
committer Amy Hsu <amyhsu@google.com> Mon Jun 15 17:04:12 2020 +0800
tree 19741d190330ebc82181e8765a7b16f145a37d35
parent 3a180d2ef522a36177c714ee5ae4f11cb3618a02
parent 98412ab60466c148370dd4ee4b83d3bb1e0a069c

resolve merge conflicts of 98412ab60466c148370dd4ee4b83d3bb1e0a069c to rvc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I831c2feb3b86bfa2008ef6e5b74e81399d8145d8

private/property_contexts

diff --git a/private/property_contexts b/private/property_contexts
index 2489c13..bab2a1a 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -858,3 +858,7 @@
 # Graphics related properties
 graphics.gpu.profiler.support          u:object_r:graphics_config_prop:s0 exact bool
 graphics.gpu.profiler.vulkan_layer_apk u:object_r:graphics_config_prop:s0 exact string
+
+# vendor-init-settable
+graphics.display.kernel_idle_timer.enabled u:object_r:surfaceflinger_display_prop:s0 exact bool
+