diff options
| author | 2024-05-01 00:30:10 +0000 | |
|---|---|---|
| committer | 2024-05-01 00:30:10 +0000 | |
| commit | 365c586b9d2744ed2d38e423d67df43358102d67 (patch) | |
| tree | 405b15c799f30f36a2b6f4d5aaba1b1138ed709b /libs/androidfw/StringPool.cpp | |
| parent | 20d149afc7e10a0f05bf4a40c47d29f6065856a4 (diff) | |
| parent | 59171ea8a6537f4ad02a25b7dbb940c7d6d7e4f2 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 0dd3ca5ef3 -s ours am: 89b91ffcc5 -s ours am: ae7827c01d -s ours am: 33c46330f6 -s ours am: 59171ea8a6 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26597514
Change-Id: I7dbf31dd9197967c75997fc7cefdb7cfacef400f
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