| commit | cca67f29339a1e1faa7dd9a45c7fa70314213064 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 00:40:51 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:40:51 2020 +0000 |
| tree | 22fabdf2db0179ed308c4e72ce902bebd5fda3c0 | |
| parent | dc37d34d50947eede476221bedef264622a5a7ac [diff] | |
| parent | f1445a64e794bf50ffc1dc587ee90121551b68df [diff] |
[automerger skipped] Merge "Merge Android R" am: f1445a64e7 -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: I5c1e2a5249889ab9cd45837683fce7a7d87ad7f6