tree a896064c1157aa56efb7c31ad99e0fccaad13c73
parent 0568a448ac42937b00fc56bc856fb6b0624d0b9a
parent 8623b1e580f1f376e40fcfd7fab7c76ce6ca5db5
author Xin Li <delphij@google.com> 1599795196 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795196 +0000

[automerger skipped] Merge "Merge Android R" am: 4b85463cce -s ours am: 9013600b43 -s ours am: 8623b1e580 -s ours

am skip reason: Change-Id Ibc7df431dd7db657dd1976c87a35cbc2e40ae595 with SHA-1 855ff2d01c is in history

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

Change-Id: I5654d61cd1bd645006da43f8c8ad506f8b1efedd