summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2024-04-29 22:03:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-29 22:03:55 +0000
commit30209ae7eec8d634c87227f090463a82e524b532 (patch)
tree12b5693e83898d5f595bca238334b7d36f59850b /libs/androidfw/StringPool.cpp
parentdfb1a2e3cdf74e378e6e64e4962522635a1945a4 (diff)
parentf2d0aa95911e655ca0042385e3f699bb828679ca (diff)
[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: f2d0aa9591 -s ours
am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 68a3c41363 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25188138 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26599513 Change-Id: Id8bb427165beb415ea13e3ec099da17258e0ecdf 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