tree ce6b61f5023d0a173a7b606df9b3edae217e2c22
parent 40ea2044e4ee2dc0fa655809a66e58df942f8b2f
parent 7e160fb8dc3d02c4813d2c35b0e0c7d2968b3219
author Karsten Tausche <karsten@fairphone.com> 1611133797 +0100
committer Karsten Tausche <karsten@fairphone.com> 1611133797 +0100

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

* security-aosp-pi-release:
  RESTRICT AUTOMERGE ANDROID: Fix negative stack write in sgdisk

Change-Id: I5bf5f34928133c577a86521c86c84fbde3b947b1