tree 2959d5f8b9181f1231f5a71cb7cefd64f2b62d86
parent d67489b372006e7a7d53ca755ffbee3291ca0570
parent 7dd51204720538a998a368a9599eaa6cda25434f
author Karsten Tausche <karsten@fairphone.com> 1638958108 +0100
committer Karsten Tausche <karsten@fairphone.com> 1638958108 +0100
mergetag object 7dd51204720538a998a368a9599eaa6cda25434f
 type commit
 tag android-11.0.0_r48
 tagger The Android Open Source Project <initial-contribution@android.com> 1633400156 -0700
 
 Android 11.0.0 Release 48 (RD2A.211001.002)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYVu1XAAKCRDorT+BmrEO
 ePSlAJ9WvyzudGlQoclBXfAY06UCvAJL5gCgjMMcEIcdOpSk39pOc0BdyRBtRSw=
 =/s8l
 -----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':
  Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to CalendarDebugActivity

Change-Id: I99f9738d9901885fffba079f9587bae151faa199