summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Iavor-Valentin Iftime <valiiftime@google.com> 2024-03-21 17:28:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-21 17:28:11 +0000
commitb1b9b90a2e699d3098dd11c5aa126ca00e0c2b13 (patch)
tree99f16d56ef6a6563b75a050f9b10c88bd2d03360 /libs/androidfw/ObbFile.cpp
parent99b113d67bdf0e315fa6f0c066684bb9a9c030ef (diff)
parent5b3f8e7f1d79c95112c6bae91ddc984f0277d963 (diff)
[automerger skipped] Merge "Check for NLS bind permission when rebinding services" into sc-dev am: 73a43831b1 am: d806b6ec65 am: 6b6f85830a -s ours am: 4c519493f6 -s ours am: 7b4f7a2250 -s ours am: e25a1fa4b1 -s ours am: 5b3f8e7f1d -s ours
am skip reason: Merged-In I11901755ec430c6e3145def9d67e4e63cda00806 with SHA-1 f126be35f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26460033 Change-Id: I5eabad089e852bad90df4d861d0bff5cfe5155d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions