tree 85cd19164802017198c4c34aa61012ec270ec885
parent a9bd80dae984b1a88480bd25b6e683285400b10b
parent 845ea13a03c2b67605dc0d8e6ee0759a6e193c50
author Karsten Tausche <karsten@fairphone.com> 1616146271 +0100
committer Karsten Tausche <karsten@fairphone.com> 1616146271 +0100

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

* security-aosp-pi-release:
  Stop returning intent data in QuickContact in onActivityResult

Change-Id: I904e12aa5e9162c1a5bf21d9da366b9cf8293d17