Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit ee1bed83 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 1a0b19b3: resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp 

Merge commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac'

* commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac':
  frameworks/base/opengl: Add NULL check
parents bfc96407 c9fe8110
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment