commit | 2a57b219ec33820cbc1ed36f334cf8639d66063f | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:42 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:42 2020 +0000 |
tree | 29a9b3e8918a54c94a53aadfcf5c49ed47a1a8ec | |
parent | d406435d05517f6e216b3cc29a2e20c0a9f64c6a [diff] | |
parent | c1c127fd990707c42d58486d1707a5d3abf2f7aa [diff] |
[automerger skipped] Merge "Merge Android R" am: 6ef1b07d5f -s ours am: b83657c630 -s ours am: 063f84501d -s ours am: afc7cbec11 -s ours am: c1c127fd99 -s ours am skip reason: Change-Id Ifb8126ec6c2ae6e79afc1a0cc620dc2f062df96d with SHA-1 8a951f4eb8 is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1421783 Change-Id: Iecff35e0bf9308e5462ff06bbd928db0cb38b011