summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2024-04-29 22:23:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-29 22:23:51 +0000
commit22dc888c027f82c9468ab4c8cfb0e8ffd4c7818f (patch)
treeba9bf4abc4425d6535c5a171b78ccac78748bbdc /libs/androidfw/StringPool.cpp
parent909c0e365cefffe2afaac6563449690000153e4d (diff)
parent318ff04f0526983a25fdd46a2c8d525dd4c620cb (diff)
[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: f2d0aa9591 -s ours am: 318ff04f05 -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/+/26599513 Change-Id: Ia7f57e3d192e206167e943548f6066bce26143b6 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