tree 0d201d5fc7397a761b7665d3c5dc7e0a203602aa
parent 16abcdf3c376c998dcb41573ed91235b6e9b756e
parent 70da31caea7d9754331d7db43c43328a436e200d
author Xin Li <delphij@google.com> 1650434150 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650434150 +0000

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: 4b6e596da6 -s ours am: 70da31caea -s ours

am skip reason: Merged-In Ib64ddfbb5c4cab579b61f0fd98a4fb39381010e0 with SHA-1 af6ff82dde is already in history

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

Change-Id: Ie5562ac4884c5d73c0f5419e86be9c039f2597c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>