summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Phil Burk <philburk@google.com> 2023-11-13 22:46:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-13 22:46:16 +0000
commit32443e3266d0599a0f9a5e5fb50e1a55bb70dee4 (patch)
tree835e79d77bece77c5a892ec33cfb2080fc02e51c /libs/androidfw/FileStream.cpp
parent400b9a56ee8e3ff4fab6ec8979043491e506e12d (diff)
parent608741d17c11c40fe9c196278db514d40e77fc78 (diff)
Merge "Revert "Add google-owned SMS short codes for Namibia, United Arab Emirates"" into main am: 3065779a38 am: 608741d17c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2828492 Change-Id: I99b877849d143b4b8ac82a13ed39867c76a1f233 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