| commit | 6fcf6b2995eef78f993c679fa82f82671eb3a2fc | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 01 21:47:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:47:05 2020 +0000 |
| tree | 22fabdf2db0179ed308c4e72ce902bebd5fda3c0 | |
| parent | 6e29ad1dfe9b353af1c41a30101673bf01d7a144 [diff] | |
| parent | 27056d6fac23818363c84eb6ff5c6b256fb55f9c [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dc37d34d50 -s ours am: 27056d6fac -s ours am skip reason: Change-Id If468db15d0f66ca059460fbf09d360360cfe8cdd with SHA-1 6e29ad1dfe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/12470128 Change-Id: Ib3261d314ac9139f68f041b85621f8399dbfbe0c