tree ff607f11dfdfd1b49d97d2ac976f2674df04ec09
parent 21cd010ab801760af84544813545b3b483dfe150
parent d24f77b99007067760affb618bbf9b022d983d40
author Todd Kjos <tkjos@google.com> 1594147182 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594147182 +0000

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

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

Change-Id: I774010bf82b9c6eb7b8d666f6c5a5a62b9779753