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

Skip to content
Commit a5433a82 authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

resolve merge conflicts of f1d0fda8 to nyc-mr1-dev-plus-aosp 

am: 5695ff4e

* commit '5695ff4e':
  GLConsumer: add build-time disable of gpu protected content

Change-Id: Iae3ac91d3b29bbea9bd9d7eb453e2429f88c684c
parents 6fa78921 5695ff4e
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