tree a1a195c6e26246ca40604f39394e2d3d03054bec
parent 8dd9150b120505bb372e7ab1a08e4a851682d0be
parent 24af9bf053a58a3d5e8a045fe6ab612c2e1cccab
author Eric Laurent <elaurent@google.com> 1714524976 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714524976 +0000

[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 24af9bf053 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26587827

Change-Id: I6a59286876dae55a5cd8d18809635582e7a69295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>