summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Martijn Coenen <maco@google.com> 2024-05-06 20:16:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-06 20:16:18 +0000
commit476d2d6b7e299ee82620337401355fd87a728c74 (patch)
treed69e201ebeeb1742bffb95f2da6f0168636ed219 /libs/androidfw/StringPool.cpp
parentd35f0190833a1a95792b21e9e028dcb7a2929348 (diff)
parent8980c37e901275086d0eedfd4d8ef4bb77189b47 (diff)
[automerger skipped] Merge "Verify UID of incoming Zygote connections." into sc-dev am: eca6d61e58 am: 4019f50055 am: a2966c0233 -s ours am: 2bdcbf598a -s ours am: 0dc3327e9f -s ours am: 1629dd0362 -s ours am: 8980c37e90 -s ours
am skip reason: Merged-In I3f85a17107849e2cd3e82d6ef15c90b9e2f26532 with SHA-1 f1d4b34ad5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26551914 Change-Id: I0c5fa25518c8b97ab948a85774fb5712df3f3ea3 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