| commit | b3dc9fc2d3f8028a0b6df9feb81557d13d096115 | [log] [tgz] |
|---|---|---|
| author | calvinpan <calvinpan@google.com> | Fri Jun 12 18:42:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 18:42:45 2020 +0000 |
| tree | 6b40097388f491daa6855f8238cb4bb3064ac6f9 | |
| parent | 7015f5d91fe3b339ac09959568fe6366140e8f25 [diff] | |
| parent | fdc7871a4d9cba400132c393c04201230def0db8 [diff] |
[automerger skipped] resolve merge conflicts of e6bb99df75749bf1f9d129cf4b1aa9974ca8a519 to rvc-d1-dev am: e925c16709 -s ours am: fdc7871a4d -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: I2348ab87bec758b056fc12fc3feaaf1146aeb3c6