tree a9efafcae02ba58640ef52784deeb8838c98c74f
parent bce307884576464cc1bfb0951d34a3ffca85e8a9
parent 4c1fc96eed42a0f4d2073be981914eac11893094
author Karsten Tausche <karsten@fairphone.com> 1638957998 +0100
committer Karsten Tausche <karsten@fairphone.com> 1638957998 +0100
mergetag object 4c1fc96eed42a0f4d2073be981914eac11893094
 type commit
 tag android-11.0.0_r48
 tagger The Android Open Source Project <initial-contribution@android.com> 1633400095 -0700
 
 Android 11.0.0 Release 48 (RD2A.211001.002)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYVu1HwAKCRDorT+BmrEO
 eKWSAJ9xBXLNbAbnOdzJFbJs5hODIq41gwCePsH/Oo8h3LUFZzFWOicK2XFoK9o=
 =E9dp
 -----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':
  [DO NOT MERGE] Change #define to _BLKID_TYPES_H

Change-Id: Ia4b41a28c45f4915bb356987ab1657ec7ab2dd28