tree 7454936d78363a5d865f44b43554b8c133ce0bac
parent 42e28019373cd8954b68cb9fb60c90ad1e3a4b6b
parent d6a445c1b57ee6d9fb8b5e7266afeaf267fb3142
author Tao Bao <tbao@google.com> 1533751590 -0700
committer android-build-merger <android-build-merger@google.com> 1533751590 -0700

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

Change-Id: I5f5e27daddd642fbff036d701e90bf900d8e3c41