tree 28e41f7b98e0f4bfebb5b5024c15cb9dd4b32e1c
parent 51909732507ad013516e2eab39abb02fc3c06cf7
parent 89582627bd8e432351b90a9561b73106c0d67833
author Maarten Derks <maarten@fairphone.com> 1628240153 +0200
committer Maarten Derks <maarten@fairphone.com> 1628240153 +0200

Merge the 2021-09-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Only treat PNG_COLOR_TYPE_RGB as 565

Change-Id: I205e28262c888b81014fb6f09097dbbf3b7e25f2