tree c5eae157f03d02babfa3a161c04f347697f0626c
parent e032bfc061dc63bbe89837b4b1b82703b4d53f76
parent fcafcd70231d609f17b3f990ba0bf8b2ea9f7376
author Karsten Tausche <karsten@fairphone.com> 1694182926 +0200
committer Karsten Tausche <karsten@fairphone.com> 1694182926 +0200

Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Fix path traversal vulnerabilities in MediaProvider

Change-Id: I1215d22e58e498c04f1230f5b1f0caaa308b6a68