summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2024-05-01 00:31:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-01 00:31:19 +0000
commite61421add2221187e7b43d6879bb923b121d8c68 (patch)
tree405b15c799f30f36a2b6f4d5aaba1b1138ed709b /libs/androidfw/StringPool.cpp
parent18fef7463037aac3e514ad58bb5a046068a5a297 (diff)
parent7e846c25c36c7a934871ee618988b0ea87ab8eba (diff)
[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 0dd3ca5ef3 -s ours am: 89b91ffcc5 -s ours am: 43ac50bdda -s ours am: db11fa5693 -s ours am: 7ff95fb78d -s ours am: 7e846c25c3 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26597514 Change-Id: I1af8072b60cdf8938f1f4e9973c43e43adc14966 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