tree b3500eb5ccd0fc360f3f4439b74a87bc4b05daa4
parent e2cd018d949b7de9e8d6819862a626f7c9c53330
parent 9313438ca29ee0284b4d1d8fcdfa2a82541641e2
author Alistair Delva <adelva@google.com> 1650521390 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650521390 +0000

[automerger skipped] Merge "Remove sysfs_gpu type definition" am: 096aafcee6 am: 4d8cc3534b am: e737a3d8a3 -s ours am: c9be610c78 -s ours am: 2b2a623798 -s ours am: 9313438ca2 -s ours

am skip reason: Merged-In I77afd0d7019e0ea0cc475de3817bc2c8e7fcd4bd with SHA-1 974bda17ec is already in history

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1999650

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