tree f9cafccea4e0cf5956c01087eabd8cf06607996a
parent 6531a6dc2350082a807424c27b09df0ccdaff073
parent 66ecc5ef7dd0d31b3a7eebcb232d9bf8a73be682
author Ivan Lozano <ivanlozano@google.com> 1513741717 +0000
committer android-build-merger <android-build-merger@google.com> 1513741717 +0000

Merge "Fix sanitizer in egl_display_t::get." am: 95e19cda6e
am: 66ecc5ef7d

Change-Id: Icdd858438f168551260cd0b4b10de1fe5087ec22