summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2024-05-01 01:55:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-01 01:55:19 +0000
commit3890b87a2f01777897c27356fae0367a236c85fd (patch)
treeced24d5722cde81d8a83c5884dcba24d23237f1b /libs/androidfw/StringPool.cpp
parenta1616ef6d157c7b0ae48b73019aacc53fa0ee6b8 (diff)
parent085541f04251aee585f92334ea56c57d2ff964ce (diff)
[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 24af9bf053 -s ours am: fefc0e14dc -s ours am: dfc1145ac4 -s ours am: 085541f042 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26587827 Change-Id: Iade9704067993381523900e70ed7446a3a2c8883 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