tree 0f71368e4a525ae561c44c20fffa9c5742a740e7
parent c812c38d88579c6456e01ed65f2bb3235540bb51
parent 2852a032b01ee36e432b267fab3b3c9bccfb4139
author Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> 1702548025 +0530
committer Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> 1702548757 +0100

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

* dev/11/fp3/security-aosp-rvc-release:
  Adjust APIs for CUPS 2.3.3

Change-Id: I7eef80bc6b60192bccfc356b681b4e5c59d0872f