tree c91031f0eff395fb55a6d09a79eac45f4884b3f9
parent 7e5a42e8bdb4af2ef5de5fddb50aa25cd7b562ef
parent 5041cd9184c1cccba34300e66e0f6a17745a599a
author Bill Yi <byi@google.com> 1641580450 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641580450 +0000

[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: bd1bcc2ed4 -s ours am: b48956ee2e -s ours am: 5041cd9184 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ieb16c0b0f099cfd80fc9cf660510786c427b03cd