tree 0314341f43bd721f5251559c264dab9b27734716
parent f9e43f59c89592a71f026e352404437281ea724a
parent 32443e3266d0599a0f9a5e5fb50e1a55bb70dee4
author Phil Burk <philburk@google.com> 1699917464 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699917464 +0000

Merge "Revert "Add google-owned SMS short codes for Namibia, United Arab Emirates"" into main am: 3065779a38 am: 608741d17c am: 32443e3266

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2828492

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