summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2024-05-01 04:41:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-01 04:41:01 +0000
commitf944d8837f29703621a1cee701195d6dd2d202c4 (patch)
treea717ca67562fc2a9760ca8d013a82683c34ffb60 /libs/androidfw/StringPool.cpp
parent0b1d73384d14b7397f660bf8cd6f55e70b5e4c38 (diff)
parentbb4aae2eb8a30419b232ed9ee0a1390ade37118f (diff)
[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 4de1b2000d -s ours am: 6bc913f9ae -s ours am: 305198963d -s ours am: cc47e0e22e -s ours am: c30fd93513 -s ours am: 2d5dc0a44f -s ours am: 8b5689348a -s ours am: bb4aae2eb8 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26596789 Change-Id: If53f085d1cb9a5ad3a69b1f72b3b3c927cb031e1 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