tree c4566f99e0c3c3b8e928f1b90a4c6a4e559d90a5
parent b05728b52def479deceaa5879f7eeb483230220e
parent 1741d9d6434ad601d76a405177b38743f0b3ea3d
author Karsten Tausche <karsten@fairphone.com> 1638958076 +0100
committer Karsten Tausche <karsten@fairphone.com> 1638958076 +0100
mergetag object 1741d9d6434ad601d76a405177b38743f0b3ea3d
 type commit
 tag android-11.0.0_r48
 tagger The Android Open Source Project <initial-contribution@android.com> 1633400124 -0700
 
 Android 11.0.0 Release 48 (RD2A.211001.002)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYVu1PAAKCRDorT+BmrEO
 eAgUAJ9AKHVt0oPpCJBwLyOzPUEt1jE5CgCeJGczj+F+ioyyBdUSZGt+HNGbmjA=
 =KCnc
 -----END PGP SIGNATURE-----

Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':
  [scudo][standalone] Skip irrelevant regions during release
  [scudo][standalone] Add new mallopt options.
  [scudo][standalone] mallopt runtime configuration options

Change-Id: I84e3f221e327556ddc8b4443759316692a2ff4bc