summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Achim Thesmann <achim@google.com> 2023-06-26 23:49:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-26 23:49:37 +0000
commit72826b9af760e041817894c06b9cc34172f90dce (patch)
tree54c13a7f5877bde8312659139d83764628a85a84 /libs/androidfw/StringPool.cpp
parentfbd842cb72101de2b74be820db579bebfa5b39bb (diff)
parentbdd7ec48349dca361e3abc0de3bbf365472c77c1 (diff)
[automerger skipped] Merge "Ignore virtual presentation windows - RESTRICT AUTOMERGE" into sc-v2-dev am: 5c30e642f7 -s ours am: bc70926f90 -s ours am: 080a59fefb -s ours am: db3d618b8a -s ours am: b7ba85215f -s ours am: 6523a5184d -s ours am: bdd7ec4834 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23475534 Change-Id: I22955fc946c6a069c7e2d55522ef47701fe2f004 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