tree ff607f11dfdfd1b49d97d2ac976f2674df04ec09
parent ee06878011908c1490ce525e961abadfb158778d
parent ba563495c5b2ba75cbdef97d27a90f4b9bf5c283
author Todd Kjos <tkjos@google.com> 1594148231 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594148231 +0000

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

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

Change-Id: I658fa5b991b6384037ef16826f4b0cae1e9b824a