tree 0e2ee502f2a55d2cde55b0cf2995d5ab0e5c7368
parent e82acddf9b4dbcfec0083203e168329eaa533546
parent 9b38d0410b8f97d3177e52c944e681367e888e37
author Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> 1690484793 +0530
committer Maarten Derks <maarten@fairphone.com> 1690979721 +0200

Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Do not load drawable for wallet card if the card image icon is created with content URI.

Change-Id: I278c010139af791f19253db5b97e0fe0c866e331