tree c4aff755138f3c606cd1296ba26ab878e8e899fa
parent 9778d7ff81dc741e0b27e178520e5aa293f0ae9b
parent 6c0d305f356deb245838716a11fb42df9c6332f2
author Emilian Peev <epeev@google.com> 1556084167 -0700
committer android-build-merger <android-build-merger@google.com> 1556084167 -0700

Merge "Check and configure pixel format when locking canvas" into qt-dev am: f8d04b2d2f
am: 6c0d305f35

Change-Id: Icd858aff2e6e8fadc9834d2aeeb9da18b83ce034