tree 9fc924fcfcaba1e6fdc33a590c75fc2425eb7962
parent a791893e15d9074eb286f30a823808990ba93e0b
parent 4263c124af1226548433fa599b8363e54c64a511
author Chris Forbes <chrisforbes@google.com> 1540252770 -0700
committer android-build-merger <android-build-merger@google.com> 1540252770 -0700

[automerger skipped] Merge "libEGL: When driver doesn't understand P3, map sRGB-encoded P3 to sRGB" am: c032734399 am: 48320ee9d2
am: 4263c124af  -s ours

Change-Id: I566e2a6246d6dd1dfd6477dc40bc9f705135456e