tree ff607f11dfdfd1b49d97d2ac976f2674df04ec09
parent 477eb10c689cbb1841c2ae3ba6fa695720cf4b44
parent 3594d8f08f871ab1fd3f7fbfc810014189c3fe8b
author Todd Kjos <tkjos@google.com> 1594146231 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594146231 +0000

Merge "gralloc_gbm: fix gralloc_gbm_bo_lock() declaration" am: a7f5619ed2 am: 3594d8f08f

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

Change-Id: Ie2970514e18d884fd09493e027f49700dcbcb95f