tag 3051995070aa7534ea8e16cbf1a101cb97d26bef
tagger The Android Open Source Project <initial-contribution@android.com> Wed Oct 04 22:48:01 2023 -0700
object c522b14186560a2faa5e846371cb97a038a0de13

frc_340818110 (10572802,com.google.android.adbd,com.google.android.appsearch,com.google.android.captiveportallogin,com.google.android.cellbroadcast,com.google.android.configinfrastructure,com.google.android.conscrypt,com.google.android.documentsui,com.google.android.extservices,com.google.android.healthfitness,com.google.android.media,com.google.android.media.swcodec,com.google.android.mediaprovider,com.google.android.neuralnetworks,com.google.android.permission,com.google.android.resolv,com.google.android.rkpd,com.google.android.scheduling,com.google.android.sdkext,com.google.android.uwb,com.google.android.wifi)

commit c522b14186560a2faa5e846371cb97a038a0de13
author Xin Li <delphij@google.com> Fri Oct 08 09:00:13 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 08 09:00:13 2021 +0000
tree c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961
parent 8c374b03c01433f6aa3f2dd121523f2a8811fe79
parent 07c476ae6d0186aa31d8b3edc864b07b5f55e267

[automerger skipped] Merge "Merge Android 12" am: 2d9cb9aa92 -s ours am: f8ff433f29 -s ours am: 84975a4332 -s ours am: e154e7e6c6 -s ours am: 07c476ae6d -s ours

am skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440

Change-Id: I017dabf6708f923301bd6bc7944c3e0e4d537612