summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Achim Thesmann <achim@google.com> 2023-06-27 01:14:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-27 01:14:51 +0000
commit0b93d634af00a454eb07058f2e74392e7df75369 (patch)
tree1335f2c3f1ec52ce293c528d7bb418360b6b343a /libs/androidfw/StringPool.cpp
parent3c4fa5f70370c814a76f0e1ba5c30557e5328033 (diff)
parent72826b9af760e041817894c06b9cc34172f90dce (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: 72826b9af7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23475534 Change-Id: I19359fca782426266218b11a88bf930a0d823522 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