tree 201c14009cd264d034ab3e7c298b111f7693715b
parent 934500069bab6f78683cfe5a3444374b5679618f
parent c427756f81d51727cd03b8934d16ee3c5bdd1385
author Xin Li <delphij@google.com> 1637272859 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637272859 +0000

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: c427756f81 -s ours

am skip reason: Merged-In I39bc668a5671cce94372063246c13bc09dd569fa with SHA-1 934500069b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/16279618

Change-Id: I8faaca117e80e2b0c8aaceeb0637251adada78fe