tree 7454936d78363a5d865f44b43554b8c133ce0bac
parent 479dd68d9ef2ed2048d222bb238edb8e73ab520a
parent 1e4f9c0477b7ac638bf9302136f979ec452902cb
author Tao Bao <tbao@google.com> 1533750641 -0700
committer android-build-merger <android-build-merger@google.com> 1533750641 -0700

Merge "Fix the DRM_FORMAT match with corresponding PixelFormat"
am: 1e4f9c0477

Change-Id: I6e373814b25c0b2baef633b5c915d8a11e5037fa