tree 1c999f769740b04956fcc8a5b833c85ed896ab2d
parent 1d165d736f0c32e1bac6fbf96205dc42a8435a61
parent 40c471d7123454db84d45820b49df9a4375c64cd
author Daniel Bright <dbright@google.com> 1614585788 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614585788 +0000

[automerger skipped] Merge "Revert^2 "Update getRadioInterfaceCapabilities return type"" am: 8abe8c71ef am: 67f86b6f33 am: 40c471d712 -s ours

am skip reason: Change-Id I137388287d102fb9ba6893ef286a4249efbc63d5 with SHA-1 95a4c1fc80 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1606545

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d4df02299533a0317573d9947673874a6046b4c