commit 7288aba6b3dc3f6140ad19d57fa79905eacee9f0
author Cyan_Hsieh <cyanhsieh@google.com> Tue Nov 19 13:33:24 2019 +0800
committer Cyan_Hsieh <cyanhsieh@google.com> Mon Nov 25 20:18:29 2019 +0800
tree 213b04264ccb08b10b51e1e614888c246731e792
parent b84383c66a5f57ca752f0cad5080b5aab0e09e1d
parent a29a59d7d280d2b9bb50ed7dc03a6783a499177f

Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.327' into qt-qpr1-dev

 Conflicts:
	config/display-product.mk
	gralloc/QtiMapper.h
	gralloc/QtiMapperExtensions.cpp
	gralloc/QtiMapperExtensions.h
	include/display_properties.h
	sdm/include/private/hw_info_types.h
	sdm/libs/core/display_base.cpp
	sdm/libs/core/display_base.h
	sdm/libs/core/display_builtin.cpp
	sdm/libs/core/display_builtin.h
	sdm/libs/hwc2/hwc_display.cpp
	sdm/libs/hwc2/hwc_display_builtin.cpp
	sdm/libs/hwc2/hwc_display_builtin.h

Bug: 144672341
Change-Id: I7855d36481ca41f23ef28bdba166c8b378b83e96