| commit | a0c138d45a710180e5ddcdefb31c71d4d804a7b4 | [log] [tgz] |
|---|---|---|
| author | calvinpan <calvinpan@google.com> | Fri Jun 12 18:30:37 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 18:30:37 2020 +0000 |
| tree | ca175be4622777d3d0df4521b8f3cc9ac13f28b5 | |
| parent | 66dd06b3bc9bc9a1c89197577ae71803b38bed66 [diff] | |
| parent | e925c167095fcfc88bb35cbb5f7a7ffeaab05c02 [diff] |
resolve merge conflicts of e6bb99df75749bf1f9d129cf4b1aa9974ca8a519 to rvc-d1-dev am: e925c16709 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/11836340 Change-Id: Ifde731a5537e460f8ca688ea1d427096f8bee824