| commit | fdc7871a4d9cba400132c393c04201230def0db8 | [log] [tgz] |
|---|---|---|
| author | calvinpan <calvinpan@google.com> | Fri Jun 12 18:30:36 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 18:30:36 2020 +0000 |
| tree | 6b40097388f491daa6855f8238cb4bb3064ac6f9 | |
| parent | 5345a6b9479935bcccbb7b8807d795f0025dfb10 [diff] | |
| parent | e925c167095fcfc88bb35cbb5f7a7ffeaab05c02 [diff] |
[automerger skipped] resolve merge conflicts of e6bb99df75749bf1f9d129cf4b1aa9974ca8a519 to rvc-d1-dev am: e925c16709 -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: Ic978038e90ceb55a8a6a2d86e2a72873e2c485d6