tree ff86df470b15e34dbf09188746919051281c6e91
parent 0294f28d765f01b6c63ac319f0b8ed11b6a883b9
parent 8d78fb5aa07648453644a90412e2b1f9f3dcd275
author Jayachandran C <jayachandranc@google.com> 1699378493 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699378493 +0000

Merge "Add google-owned SMS short codes for Namibia, United Arab Emirates" into main am: 6313459055 am: 8d78fb5aa0

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

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