tree 12b5693e83898d5f595bca238334b7d36f59850b
parent dfb1a2e3cdf74e378e6e64e4962522635a1945a4
parent f2d0aa95911e655ca0042385e3f699bb828679ca
author Eric Laurent <elaurent@google.com> 1714428235 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714428235 +0000

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

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 68a3c41363 is already in history. Merged-In was found from reverted change.

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

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

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