tree 7454936d78363a5d865f44b43554b8c133ce0bac
parent c31067b02c3f9cee49969e6da82ac185b1bab003
parent 53bca233b14e7eeedfa5dc483374ef03dcf3b986
author Tao Bao <tbao@google.com> 1533753176 -0700
committer android-build-merger <android-build-merger@google.com> 1533753176 -0700

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

Change-Id: Ideb0925b09621a8d68c117a881863c281381c9f5