| commit | b751591b530c66417c0ef53d09346442757f7a14 | [log] [tgz] |
|---|---|---|
| author | calvinpan <calvinpan@google.com> | Fri Jul 02 04:45:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 02 04:45:59 2021 +0000 |
| tree | f5e0ba1f7fc8338b99ca383f199e69c53a061a87 | |
| parent | 7e1afea5bcc039257930f322113e5166ebe06bc4 [diff] | |
| parent | 3c6c9f99caca41ca23a069d364b3f0084d48f037 [diff] |
[automerger skipped] resolve merge conflicts of e6bb99df75749bf1f9d129cf4b1aa9974ca8a519 to mainline-prod am: 3c6c9f99ca -s ours am skip reason: Merged-In Ieb482e6c5284731806acb1391857bcc1999b2f27 with SHA-1 a11bff98a3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/15126060 Change-Id: I9d1b62d1d90571d29796f0190d158c268512967b