tree 703935802c89486aa9362681772794424c921da3
parent 818bd607d586a6157aa83df78e7847190b7a5f09
parent 394a97f19e6dac1feb65d145ea3acadd9c546058
author Xin Li <delphij@google.com> 1620443194 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620443194 +0000

[automerger skipped] Merge "DO NOT MERGE -  Mark RQ2A.210105.001 as merged." am: d78ef43a1d -s ours am: 86c1af9d9f -s ours am: efdf336986 -s ours am: 394a97f19e -s ours

am skip reason: Merged-In Ibe6ead59b647b0983516e648d2848e2daa56bf31 with SHA-1 68f2134d63 is already in history

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

Change-Id: Iadabf38b76965997e73092972e0390a5cf664be9