summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Achim Thesmann <achim@google.com> 2023-06-24 01:18:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-24 01:18:57 +0000
commit6523a5184dbbfc8557e390cb899062bdb328b326 (patch)
tree345755a037c8382007190f60466293bb31506f5e /libs/androidfw/StringPool.cpp
parent1b1b7ac0a06bae0e9eb42968a3506eff3e96879a (diff)
parentb7ba85215f3c6ebc1c106bd42e50b81a2ececfff (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23475534 Change-Id: I1d839c4c61cc6d241f0f173f4b05acbf3cd88436 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