summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2024-04-30 15:28:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-30 15:28:23 +0000
commit520d9dfa5b8dc6b20ee0dab803dc74378110668d (patch)
treeced24d5722cde81d8a83c5884dcba24d23237f1b /libs/androidfw/StringPool.cpp
parentbdd4495eeaef5fb93b0e20c9530803490444d4ca (diff)
parent4439d891391853e736cff97e9ca7a7a01340d693 (diff)
[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 5c1a88fea0 -s ours am: 4439d89139 -s ours
am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 68a3c41363 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26599511 Change-Id: Ide7f9f45d91202ee1c12331fb6305a3dfa5176bf 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