summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Phil Burk <philburk@google.com> 2023-11-13 23:15:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-13 23:15:53 +0000
commitf9e43f59c89592a71f026e352404437281ea724a (patch)
tree0314341f43bd721f5251559c264dab9b27734716 /libs/androidfw/FileStream.cpp
parentef8cae9e3a5ddf12d8a2e156c82691efe049c394 (diff)
parent400b9a56ee8e3ff4fab6ec8979043491e506e12d (diff)
Merge "Revert "Add google-owned SMS short codes for Namibia, United Arab Emirates"" into main am: 3065779a38 am: 518f979e5d am: 400b9a56ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2828492 Change-Id: I9798237b03015d86f2523f14f583ad694d8ac3ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions