tree 04ad0c327a08bd0f29909fb7ed4a0aa51426ba8e
parent eb77411df7281889b0b32e05aa3951bfd8f8400e
parent 027b5ff72c651819454e210efbafa74e6ce68fd8
author Michael Bestas <mkbestas@lineageos.org> 1718411266 +0300
committer Michael Bestas <mkbestas@lineageos.org> 1718411266 +0300
mergetag object 027b5ff72c651819454e210efbafa74e6ce68fd8
 type commit
 tag android-14.0.0_r50
 tagger The Android Open Source Project <initial-contribution@android.com> 1718055847 -0700
 
 Android 14.0.0 Release 50 (AP2A.240605.024)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzpwAKCRDorT+BmrEO
 eLWsAJsFtNtJ0JkGDP3r4CIfWgZukBmECwCffoR+np4v/Hqng9xFJnV9mK12WWU=
 =Wqdp
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmZs4AIXHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmklsQ/+MNWyWCljInfWWaXBAapTvqqj
 iG2/K5dgAG7qEKxLSh2i5mwdz4tZJvpQrO9zjCQbO5Uwl2i8EyDJGhOXaeJ1/vFO
 BCvfyIIGIXcHc35I8cfZhUmQd0/vsiUREjGCyOq1Nmundg46HBKfzHAdLJKfkKV/
 zVU0SdLMallNSCP6lCSRQFU4lCZLcmthem5v3jdR1q0dudGkU77fmGFDwjnVwOqA
 G4v0X6LCHuNga5P0WaWl7D4507ZIzHGk2gsbdcuH7uG6909wpimt1GV3XVDHowkF
 oAirj+oUyUYl9YY3QDrabBX4PCEcc6piGcXAF0SYfH28WZrXufD3dZUCJbOoGicm
 mosH2S9XhQDLg7rVMw7NxzB/3NU//cyNmnW9kJMG7QPKP4dzn4JsycOHqR2KKylK
 fAxwlo35yEBkXdRUz/zCm1bBFAQD9ClF8DgWyhbI5wO5irdh0KiB5iE85jid1Eno
 BMl/RB1048ymtY/kVrrO12c7taUfWe01UV8PurSgNVyc2w2MW81nWaDaSzZybl4W
 xYlnoSXu0Vj6xYy3Wwpa9hPVg8dDLnqgS4OtXNTsZmVsjAcL5y+Wtz395oGPkHVC
 OhQfB2TsdxApYtEyayyf8fEMzkPbh0xOI0K/Feyf9bAGqoZKjggSQmhGN0qoI8e0
 5AJ75J/cIk9od366Kps=
 =vJzU
 -----END PGP SIGNATURE-----

Merge tag 'android-14.0.0_r50' into staging/lineage-21.0_merge-android-14.0.0_r50

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzpwAKCRDorT+BmrEO
# eLWsAJsFtNtJ0JkGDP3r4CIfWgZukBmECwCffoR+np4v/Hqng9xFJnV9mK12WWU=
# =Wqdp
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:07 2024 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2502 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Fangqiu Su (1) and Nelson Li (1)
# Via Automerger Merge Worker (4) and others
* tag 'android-14.0.0_r50':
  Update the imports to androidx.test.filters.*
  Correct the year definition in Android.bp of messagingtest

Change-Id: I888d640f75eeaf644d00ce03a7993abcf3060baf