tree 7454936d78363a5d865f44b43554b8c133ce0bac
parent 4bdb7b3c33a9e2d6e762598e7ad851d2a2fa045d
parent e0ded949e6f25e58d9f325b5f63d66ba51fe7bd6
author Tao Bao <tbao@google.com> 1533751100 -0700
committer android-build-merger <android-build-merger@google.com> 1533751100 -0700

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

Change-Id: I24c5dba3f0f22a92279a61cacd1162b8256b22ef