summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Paul Colța <donpaul@google.com> 2023-12-07 09:12:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-07 09:12:37 +0000
commitc4e767f89af456af666c1477b02ce640f2403487 (patch)
tree4d622ca9b673e7ef9cb74916aa4bf53da4ff9617 /libs/androidfw/StringPool.cpp
parentbdcaac71da0848d7c934d538f32e9aeca7c57d01 (diff)
parenta31704ca6b6d07fc65b48a86783b7ec8cf73198d (diff)
[automerger skipped] Merge "Remove redundant <Give OSD name> for TV devices" into main am: 46d14dde18 am: a31704ca6b -s ours
am skip reason: Merged-In Ide00d75807d9456ba46576f91ebf6d0ecaf4f931 with SHA-1 157ffd583f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481795 Change-Id: I72efdb2441d93d61232a07519fd7967ddb9f0e52 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