| commit | 5e86920f5f74899a7b6f81d05fe379a151653649 | [log] [tgz] |
|---|---|---|
| author | Michael Groover <mpgroover@google.com> | Mon Feb 08 17:46:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 08 17:46:42 2021 +0000 |
| tree | ee4cfd2808f3c875cd1535670a49366720df1484 | |
| parent | 8e9b7568430869b2a6955315844725d0f1b9a2ca [diff] | |
| parent | c9d7a0494d95d7ca4ba5c0b544a9a552634a7d27 [diff] |
[automerger skipped] resolve merge conflicts of 9c392805dc4c5d5c9a95a5dec9c7f65130cd8173 to qt-qpr1-dev am: f0a7b0dfbc -s ours am: c9d7a0494d -s ours am skip reason: Change-Id Iab02eef23a9b34d3e5eaceaabc8affd3725f5f3c with SHA-1 2c375efa10 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/13465058 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0008bd0afdc1f1884fb67e3aed0f7332dc38d99c