tree 22fabdf2db0179ed308c4e72ce902bebd5fda3c0
parent 52c9843fa02026865333f4a2b78a85a8378c772f
parent b64a28155ae3c48b41ffe9a02e7080382646b89f
author Xin Li <delphij@google.com> 1599796764 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796764 +0000

[automerger skipped] Merge "Merge Android R" am: f1445a64e7 -s ours am: cca67f2933 -s ours am: b7230439a5 -s ours am: b64a28155a -s ours

am skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history

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

Change-Id: I8c570e3fbe169c231341f52fbb65a13296df5b30