commit | 38eafb3ec84df80c7469ebad22b8a2a531f4689b | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:35 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:35 2020 +0000 |
tree | 9ee1af279f3a9ece3ec7ca3d8ec72f4b6ed99311 | |
parent | ea2cc7ee0b6ed324e31f3eb7988ca28a787640b9 [diff] | |
parent | fcb79c23d2cc7eac15c2e8430e42af7b36476c40 [diff] |
[automerger skipped] Merge "Merge Android R" am: ed293f028d -s ours am: fcb79c23d2 -s ours am skip reason: Change-Id I1da6f480b01ed3afe1fa4fb5af78044945a51540 with SHA-1 f0c35e00ec is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1422405 Change-Id: Iefdfd09ba34004a140c8d5f84e904b7089f6ab1d