tag 255898dcddb9ecab12021d5a9f77b08ce37ac012
tagger The Android Open Source Project <initial-contribution@android.com> Thu Jan 04 16:56:08 2024 -0800
object c522b14186560a2faa5e846371cb97a038a0de13

frc_340819010 (10586669,com.google.android.adbd,com.google.android.adservices,com.google.android.appsearch,com.google.android.captiveportallogin,com.google.android.configinfrastructure,com.google.android.conscrypt,com.google.android.documentsui,com.google.android.ext.services,com.google.android.extservices,com.google.android.go.adbd,com.google.android.go.adservices,com.google.android.go.appsearch,com.google.android.go.captiveportallogin,com.google.android.go.configinfrastructure,com.google.android.go.conscrypt,com.google.android.go.documentsui,com.google.android.go.extservices,com.google.android.go.ipsec,com.google.android.go.mediaprovider,com.google.android.go.networkstack,com.google.android.go.neuralnetworks,com.google.android.go.ondevicepersonalization,com.google.android.go.os.statsd,com.google.android.go.resolv,com.google.android.go.rkpd,com.google.android.go.scheduling,com.google.android.go.sdkext,com.google.android.go.tethering,com.google.android.go.tzdata5,com.google.android.go.uwb,com.google.android.go.wifi,com.google.android.ipsec,com.google.android.networkstack,com.google.android.neuralnetworks,com.google.android.ondevicepersonalization,com.google.android.os.statsd,com.google.android.resolv,com.google.android.rkpd,com.google.android.scheduling,com.google.android.sdkext,com.google.android.tethering,com.google.android.tzdata5,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