| commit | a2910ddf2e208436c4716f71efdf3efb792aff0b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:53 2020 +0000 |
| tree | 86b4407700e8231d7fb9b257abbf43f346d9e908 | |
| parent | f573431ab2d3b7192f6fac0c0468f37adc5e302a [diff] | |
| parent | 082969a5b2dea5cf9ea415d2b736886d38991e3c [diff] |
[automerger skipped] Merge "Merge Android R" am: f1445a64e7 -s ours am: cca67f2933 -s ours am: b7230439a5 -s ours am: b64a28155a -s ours am: 082969a5b2 -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: I715fb8999e05f0ec8ecd48909a06c762dc35ff72