| commit | 7015f5d91fe3b339ac09959568fe6366140e8f25 | [log] [tgz] |
|---|---|---|
| author | calvinpan <calvinpan@google.com> | Fri Jun 12 18:42:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 18:42:28 2020 +0000 |
| tree | 6b40097388f491daa6855f8238cb4bb3064ac6f9 | |
| parent | cfdc6094f56d0b38575d32e6a5103b12079b03ec [diff] | |
| parent | a0c138d45a710180e5ddcdefb31c71d4d804a7b4 [diff] |
[automerger skipped] resolve merge conflicts of e6bb99df75749bf1f9d129cf4b1aa9974ca8a519 to rvc-d1-dev am: e925c16709 am: a0c138d45a -s ours am skip reason: Change-Id Ieb482e6c5284731806acb1391857bcc1999b2f27 with SHA-1 a11bff98a3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/11836340 Change-Id: I5662470d52d4e11f4c9d818b482d201cc31d1615