tree 4ecacb0ab75003c346aeb6d3dd5decb44ef17b86
parent 9f3c3f09185f134c8fcef586395221943fad3ac7
parent 04902d14bf34ad6a9082d7a4125fab26c987d4a0
author Xin Li <delphij@google.com> 1599859676 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859676 +0000

[automerger skipped] Merge "Merge Android R" am: 816ad2b6a2 -s ours am: 2ec4698a1b -s ours am: c18c96890c -s ours am: efaf780e35 -s ours am: 04902d14bf -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: I7beb8c80fcf5fdaf74e2d423a42b6cd511b9aa7b