Commit 1a30e186 authored by Konstantinos Menychtas's avatar Konstantinos Menychtas Committed by Android Git Automerger
Browse files

am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp 

* commit 'c8f7ca09':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
parents 90ae7159 c8f7ca09
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment