tree e2b1f63a66dd501d88c62619ad7ad082cc730504
parent c439bf2afdf6dc90df4ceebcfee0db3ee4f6972d
parent efaf780e35320aabc99486946a409741032e3450
author Xin Li <delphij@google.com> 1599796767 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796767 +0000

[automerger skipped] Merge "Merge Android R" am: 816ad2b6a2 -s ours am: 2ec4698a1b -s ours am: c18c96890c -s ours am: efaf780e35 -s ours

am skip reason: Change-Id Ib83cd87683ae896de789cdf6cd0c801562a191d5 with SHA-1 62fe343bc4 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1422454

Change-Id: I16231c01fbd4550f40cfbc75ae1854aae5d33b0c