tree 356279f7af225dcf3856a71256999d0668df52de
parent cf35d9ee51fc5d20f6fc30b3481aca481a94b419
parent 1c86936b698f16468971d0e6a08ae9b88567940f
author Maarten Derks <maarten@fairphone.com> 1658219076 +0200
committer Maarten Derks <maarten@fairphone.com> 1658219076 +0200

Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2

* dev/10/fp2/security-aosp-qt-release:
  [DO NOT MERGE] Update external/okhttp/repackaged to match source.

Change-Id: Ib1556ad1a83a0973dda8f7d0cb54c6ed12d05b7d