summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Daniel Peykov <peykov@google.com> 2022-11-02 21:50:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-02 21:50:02 +0000
commite6716cc4895787ed6512f5e4c28c0d49899c6460 (patch)
treefd3e4c174ab56df1c2c9a5a5fc71d19b7f90607c /libs/androidfw/StringPool.cpp
parentbc8b29a829288403dd906aa968055a1284377434 (diff)
parent90b4735821a022fcded382e6a5d25e166b6e59cd (diff)
[automerger skipped] Merge "Fix display size calculations in large screen (2/3)" am: 3b60cd3b94 -s ours am: 90b4735821 -s ours
am skip reason: Merged-In I9223ef5552ddb081e75de1242670862f2813e56d with SHA-1 d1e350c7fc is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2281606 Change-Id: Ie250828015a0a99a78dba80ec9417d00fe9eb688 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