tree e5c7941ea4b7ea9f51fc4451d204de82764caa69
parent 39931c49ec5f4dddb1b3363eca36978e1168cabf
parent ff730f9b4b9a251782dc6808ea32c1ecf3cdb459
author John Stultz <john.stultz@linaro.org> 1583180273 +0000
committer John Stultz <john.stultz@linaro.org> 1583183268 +0000

Merge remote-tracking branch 'aosp/upstream-master' into HEAD

This algins AOSP/master w/ the upstream gitlab master branch.

This merge undoes some of the recent reverts on AOSP/master
and instead takes the upstream fixes for those issues.

* aosp/upstream-master:
  drm_hwcomposer: Relax failure when no EDID property is found
  drm_hwcomposer: Improve error messages.
  drm_hwcomposer: Add statistics on flattening to dump message
  drm_hwcomposer: Add fallback to client for layers flattening
  drm_hwcomposer: Add property that allows disabling of hardware scaling
  drm_hwcomposer: Try to fix build with older Android Pie releases
  drm_hwcomposer: Extract more BO data by Imagination importer v2
  drm_hwcomposer: Revert "drm_hwcomposer: Extract more BO data by Imagination importer"

Change-Id: I6c2ba4c2d8a4193952ee51faf3fcc1ad061a6d72
Signed-off-by: John Stultz <john.stultz@linaro.org>