summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2024-03-07 18:00:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-07 18:00:35 +0000
commit0731cc8de6e4ec05007f2c306945f0ca96c8f887 (patch)
treefa2fc2b3d4fc83c29cb18bdff5460af4e5912cfb /libs/androidfw/StringPool.cpp
parent6ff1201b793b9843a9054afb6289cb94cc07d786 (diff)
parentc27b8893aee0609195169145545f47891c0475f5 (diff)
Merge "Update Android's bundled mime.types mapping." into main am: 4681b3be90 am: c27b8893ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2989630 Change-Id: I5496f801a26cf6532f023b69069996c02da467f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions