| commit | 40d02ae9da2edb607d7294c49177a982400dba32 | [log] [tgz] |
|---|---|---|
| author | calvinpan <calvinpan@google.com> | Fri Jul 02 05:02:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 02 05:02:58 2021 +0000 |
| tree | f5e0ba1f7fc8338b99ca383f199e69c53a061a87 | |
| parent | 9b823f3d6aad21ce068efcbab48c6336108dbfe2 [diff] | |
| parent | b751591b530c66417c0ef53d09346442757f7a14 [diff] |
[automerger skipped] resolve merge conflicts of e6bb99df75749bf1f9d129cf4b1aa9974ca8a519 to mainline-prod am: 3c6c9f99ca -s ours am: b751591b53 -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: I3555bc939b14cec6cc20761a29fba0b836cd17f1