summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Jakub Pawłowski <jpawlowski@google.com> 2024-11-15 17:13:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-11-15 17:13:21 +0000
commit2e01fbb813072df9c2c3ab1ff3d89fd60cadb833 (patch)
tree5a918bdac2d49acd32a9faf21edda10a60eedb78 /libs/androidfw/ObbFile.cpp
parent0650966818cbc3bc8fb88b9fc72799729a1155a9 (diff)
parent8e1671a79bcb5272c0223027ecd981269a9fbb67 (diff)
[automerger skipped] Merge "Add "com.android.btservices" to 'apex_available' property of "android.os.flags-aconfig-java-export"" into main am: ccad2d8f62 -s ours am: 8e1671a79b -s ours
am skip reason: Merged-In Ifc77a4fc888847e4b03a2b6ed66d2fac0f6d6f55 with SHA-1 5fd64d5683 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3349971 Change-Id: Ib8b953a8bff74afe261feae882e689976718e648 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