tree 0800aa922f7c115d2d3b6f2ed753d2181e699ae4
parent 4072851fe9a391a753f809f28a207773e2211702
parent 7a7643e9e265db79eec8b73083694a602c394e0a
author Xin Li <delphij@google.com> 1599795231 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795231 +0000

[automerger skipped] Merge "Merge Android R" am: e90c0493aa -s ours am: 66017a9f92 -s ours am: 7a7643e9e2 -s ours

am skip reason: Change-Id Iadd29bb5e9261c072ae58bcada1f1aa2fd49dbe5 with SHA-1 a105c902ce is in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/1422320

Change-Id: I94b867f2381eec4f1c8ff125e79ece8ebfff695f